Title: [128868] trunk
- Revision
- 128868
- Author
- [email protected]
- Date
- 2012-09-18 03:23:13 -0700 (Tue, 18 Sep 2012)
Log Message
[Qt] Fix build without the QtQuick module
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128867 => 128868)
--- trunk/Source/WebKit2/ChangeLog 2012-09-18 09:42:38 UTC (rev 128867)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-18 10:23:13 UTC (rev 128868)
@@ -1,3 +1,11 @@
+2012-09-18 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Fix build without the QtQuick module
+
+ Reviewed by Simon Hausmann.
+
+ * Target.pri:
+
2012-09-17 Eunmi Lee <[email protected]>
[EFL][WK2] Add NativeWebTouchEvent and handle the Touch event.
Modified: trunk/Source/WebKit2/Target.pri (128867 => 128868)
--- trunk/Source/WebKit2/Target.pri 2012-09-18 09:42:38 UTC (rev 128867)
+++ trunk/Source/WebKit2/Target.pri 2012-09-18 10:23:13 UTC (rev 128868)
@@ -617,7 +617,6 @@
UIProcess/WebUIClient.cpp \
UIProcess/WebVibrationProvider.cpp \
UIProcess/WebVibrationProxy.cpp \
- UIProcess/qt/QtWebContext.cpp \
UIProcess/qt/TextCheckerQt.cpp \
UIProcess/qt/WebContextQt.cpp \
UIProcess/qt/WebFullScreenManagerProxyQt.cpp \
@@ -809,7 +808,6 @@
UIProcess/API/qt/qwebpreferences.cpp \
UIProcess/API/qt/qwebkittest.cpp \
UIProcess/qt/PageViewportControllerClientQt.cpp \
- UIProcess/qt/QtWebError.cpp \
UIProcess/qt/QtDialogRunner.cpp \
UIProcess/qt/QtDownloadManager.cpp \
UIProcess/qt/QtPageClient.cpp \
@@ -821,6 +819,8 @@
UIProcess/qt/QtPanGestureRecognizer.cpp \
UIProcess/qt/QtPinchGestureRecognizer.cpp \
UIProcess/qt/QtTapGestureRecognizer.cpp \
+ UIProcess/qt/QtWebContext.cpp \
+ UIProcess/qt/QtWebError.cpp \
UIProcess/qt/WebContextMenuProxyQt.cpp \
UIProcess/qt/WebGeolocationProviderQt.cpp \
UIProcess/qt/WebPopupMenuProxyQt.cpp \
Modified: trunk/Tools/ChangeLog (128867 => 128868)
--- trunk/Tools/ChangeLog 2012-09-18 09:42:38 UTC (rev 128867)
+++ trunk/Tools/ChangeLog 2012-09-18 10:23:13 UTC (rev 128868)
@@ -1,3 +1,11 @@
+2012-09-18 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Fix build without the QtQuick module
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-09-18 Stephanie Lewis <[email protected]>
Build fix after http://trac.webkit.org/projects/webkit/changeset/128852.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (128867 => 128868)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-18 09:42:38 UTC (rev 128867)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-18 10:23:13 UTC (rev 128868)
@@ -34,6 +34,8 @@
#
haveQtModule(quick): WEBKIT_CONFIG += have_qtquick
+ else: CONFIGURE_WARNINGS += "QtQuick module not found, QML APIs will not be built"
+
haveQtModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
haveQtModule(widgets): WEBKIT_CONFIG += have_qstyle
haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
