Title: [96116] trunk
- Revision
- 96116
- Author
- o...@webkit.org
- Date
- 2011-09-27 09:12:20 -0700 (Tue, 27 Sep 2011)
Log Message
[Qt][WK2] Buildfix after r96108.
Rubber-stamped by Andreas Kling.
Source/WebKit/qt:
* tests/tests.pri:
Tools:
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* WebKitTestRunner/qt/EventSenderProxyQt.cpp:
* WebKitTestRunner/qt/WebKitTestRunner.pro:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (96115 => 96116)
--- trunk/Source/WebKit/qt/ChangeLog 2011-09-27 15:52:14 UTC (rev 96115)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-09-27 16:12:20 UTC (rev 96116)
@@ -1,3 +1,11 @@
+2011-09-27 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt][WK2] Buildfix after r96108.
+
+ Rubber-stamped by Andreas Kling.
+
+ * tests/tests.pri:
+
2011-09-27 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Fix build of declarative plugin against Qt5
Modified: trunk/Source/WebKit/qt/tests/tests.pri (96115 => 96116)
--- trunk/Source/WebKit/qt/tests/tests.pri 2011-09-27 15:52:14 UTC (rev 96115)
+++ trunk/Source/WebKit/qt/tests/tests.pri 2011-09-27 16:12:20 UTC (rev 96116)
@@ -21,6 +21,7 @@
include(../../../WebKit.pri)
QT += testlib network
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
lessThan(QT_MAJOR_VERSION, 5) {
contains(QT_CONFIG, declarative): QT += declarative
Modified: trunk/Tools/ChangeLog (96115 => 96116)
--- trunk/Tools/ChangeLog 2011-09-27 15:52:14 UTC (rev 96115)
+++ trunk/Tools/ChangeLog 2011-09-27 16:12:20 UTC (rev 96116)
@@ -1,3 +1,13 @@
+2011-09-27 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt][WK2] Buildfix after r96108.
+
+ Rubber-stamped by Andreas Kling.
+
+ * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+ * WebKitTestRunner/qt/EventSenderProxyQt.cpp:
+ * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
2011-09-27 David Levin <le...@chromium.org>
watchlist: Change watchlistparser.py to be class based.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro (96115 => 96116)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro 2011-09-27 15:52:14 UTC (rev 96115)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro 2011-09-27 16:12:20 UTC (rev 96116)
@@ -9,6 +9,7 @@
}
QT += declarative
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
GENERATED_SOURCES_DIR = ../../generated
Modified: trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp (96115 => 96116)
--- trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp 2011-09-27 15:52:14 UTC (rev 96115)
+++ trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp 2011-09-27 16:12:20 UTC (rev 96116)
@@ -28,6 +28,7 @@
#include "PlatformWebView.h"
#include "TestController.h"
+#include <QGraphicsSceneMouseEvent>
#include <QKeyEvent>
#include <QtTest/QtTest>
#include <WebKit2/WKPagePrivate.h>
Modified: trunk/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro (96115 => 96116)
--- trunk/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro 2011-09-27 15:52:14 UTC (rev 96115)
+++ trunk/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro 2011-09-27 16:12:20 UTC (rev 96116)
@@ -32,6 +32,7 @@
}
QT = core gui network declarative testlib
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
HEADERS = \
$$BASEDIR/EventSenderProxy.h \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes