Title: [126147] trunk
- Revision
- 126147
- Author
- [email protected]
- Date
- 2012-08-21 01:54:32 -0700 (Tue, 21 Aug 2012)
Log Message
Source/WebKit2: Unreviewed build fix for newer Qt 5: QT += qmltest does not imply QT += testlib anymore, but
the code here needs QSignalSpy from QTestLib
* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
* UIProcess/API/qt/tests/qmltests/WebView.pro:
Tools: Unreviewed build fix for newer Qt 5: The meaning of private_includes changed to be fully
self-contained. The module name is not appended automatically anymore.
* qmake/qt_webkit.pri:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (126146 => 126147)
--- trunk/Source/WebKit2/ChangeLog 2012-08-21 08:54:02 UTC (rev 126146)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-21 08:54:32 UTC (rev 126147)
@@ -1,3 +1,11 @@
+2012-08-21 Simon Hausmann <[email protected]>
+
+ Unreviewed build fix for newer Qt 5: QT += qmltest does not imply QT += testlib anymore, but
+ the code here needs QSignalSpy from QTestLib
+
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
+ * UIProcess/API/qt/tests/qmltests/WebView.pro:
+
2012-08-18 John Sullivan <[email protected]>
<https://bugs.webkit.org/show_bug.cgi?id=94486>
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro (126146 => 126147)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro 2012-08-21 08:54:02 UTC (rev 126146)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro 2012-08-21 08:54:32 UTC (rev 126147)
@@ -6,7 +6,6 @@
QT += webkit-private
CONFIG += warn_on testcase
-QT -= testlib
QT += qmltest
DEFINES += DISABLE_FLICKABLE_VIEWPORT=1
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro (126146 => 126147)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro 2012-08-21 08:54:02 UTC (rev 126146)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro 2012-08-21 08:54:32 UTC (rev 126147)
@@ -6,7 +6,6 @@
QT += webkit-private
CONFIG += warn_on testcase
-QT -= testlib
QT += qmltest
# Test the QML files under WebView in the source repository.
Modified: trunk/Tools/ChangeLog (126146 => 126147)
--- trunk/Tools/ChangeLog 2012-08-21 08:54:02 UTC (rev 126146)
+++ trunk/Tools/ChangeLog 2012-08-21 08:54:32 UTC (rev 126147)
@@ -1,3 +1,10 @@
+2012-08-21 Simon Hausmann <[email protected]>
+
+ Unreviewed build fix for newer Qt 5: The meaning of private_includes changed to be fully
+ self-contained. The module name is not appended automatically anymore.
+
+ * qmake/qt_webkit.pri:
+
2012-08-20 Xianzhu Wang <[email protected]>
[Chromium-Android] Add stop_when_done parameter to ChromiumAndroidDriver.run_test()
Modified: trunk/Tools/qmake/qt_webkit.pri (126146 => 126147)
--- trunk/Tools/qmake/qt_webkit.pri 2012-08-21 08:54:02 UTC (rev 126146)
+++ trunk/Tools/qmake/qt_webkit.pri 2012-08-21 08:54:32 UTC (rev 126147)
@@ -9,7 +9,7 @@
QT.webkit.bins = $$QT_MODULE_BIN_BASE
QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
QT.webkit.imports = $$QT_MODULE_IMPORT_BASE
-QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION
+QT.webkit.private_includes = $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION $$QT_MODULE_INCLUDE_BASE/$$QT.webkit.name/$$QT.webkit.VERSION/$$QT.webkit.name
QT.webkit.sources = $$QT_MODULE_BASE
QT.webkit.libs = $$QT_MODULE_LIB_BASE
QT.webkit.depends = core gui opengl network
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
