Title: [98858] trunk/Source/WebKit2
- Revision
- 98858
- Author
- [email protected]
- Date
- 2011-10-31 08:49:04 -0700 (Mon, 31 Oct 2011)
Log Message
[Qt][WK2] Fix qmltests after r98460 added widgets dependency.
Reviewed by Simon Hausmann.
Use QApplication and QtWidgets until we get rid of the widgets dependency of QScroller.
* UIProcess/API/qt/tests/qmltests/qmltests.pro:
* UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
(main):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98857 => 98858)
--- trunk/Source/WebKit2/ChangeLog 2011-10-31 15:29:38 UTC (rev 98857)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-31 15:49:04 UTC (rev 98858)
@@ -1,3 +1,15 @@
+2011-10-31 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Fix qmltests after r98460 added widgets dependency.
+
+ Reviewed by Simon Hausmann.
+
+ Use QApplication and QtWidgets until we get rid of the widgets dependency of QScroller.
+
+ * UIProcess/API/qt/tests/qmltests/qmltests.pro:
+ * UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
+ (main):
+
2011-10-31 Caio Marcelo de Oliveira Filho <[email protected]>
[Qt] Make QWebPreferences hold a QtWebPageProxy
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro (98857 => 98858)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-10-31 15:29:38 UTC (rev 98857)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-10-31 15:49:04 UTC (rev 98858)
@@ -3,7 +3,7 @@
CONFIG += warn_on testcase
SOURCES += tst_qmltests.cpp
-QT += declarative qmltest
+QT += declarative qmltest widgets
# QML files tested are the ones in WebKit source repository.
DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp (98857 => 98858)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-10-31 15:29:38 UTC (rev 98857)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-10-31 15:49:04 UTC (rev 98858)
@@ -18,4 +18,12 @@
*/
#include <QtQuickTest/quicktest.h>
-QUICK_TEST_MAIN(qmltests)
+#include <QtWidgets/QApplication>
+
+int main(int argc, char** argv)
+{
+ // Instantiate QApplication to prevent quick_test_main to instantiate a QGuiApplication.
+ // This can be removed as soon as we do not use QtWidgets any more.
+ QApplication app(argc, argv);
+ return quick_test_main(argc, argv, "qmltests", 0, QUICK_TEST_SOURCE_DIR);
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
