[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kenneth at webkit.org
kenneth at webkit.org
Wed Dec 22 14:28:56 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 66489e96920d59dcc57aa96d19d06885b61c740e
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 16:08:17 2010 +0000
Build fix when using MeeGo Touch
Rubberstamped by Andreas Kling.
* WebProcess/qt/WebProcessMainQt.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69497 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 34d69f5..8df2c24 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
2010-10-11 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+ Rubberstamped by Andreas Kling.
+
+ Build fix when using MeeGo Touch
+
+ * WebProcess/qt/WebProcessMainQt.cpp:
+
+2010-10-11 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
+
Reviewed by Andreas Kling.
Use raster for the QtWebProcess.
diff --git a/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
index a2b5cca..40dc8d8 100644
--- a/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
+++ b/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
@@ -35,7 +35,7 @@
#include <QtGlobal>
#if USE(MEEGOTOUCH)
-#include <meegotouch/MComponentData>
+#include <MComponentData>
#endif
#if !defined(QWEBKIT_EXPORT)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list