Diff
Modified: trunk/Source/WebKit2/ChangeLog (108327 => 108328)
--- trunk/Source/WebKit2/ChangeLog 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-21 10:57:13 UTC (rev 108328)
@@ -1,3 +1,17 @@
+2012-02-21 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Get rid of the dependency to QtWidgets
+ https://bugs.webkit.org/show_bug.cgi?id=76276
+
+ Reviewed by Simon Hausmann.
+
+ * Target.pri:
+ * UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
+ (main):
+ * UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+ * UIProcess/API/qt/tests/tests.pri:
+ * UIProcess/API/qt/tests/util.h:
+
2012-02-20 Martin Robinson <[email protected]>
[UNIX] Plugin information fields are not interpreted as UTF-8
Modified: trunk/Source/WebKit2/Target.pri (108327 => 108328)
--- trunk/Source/WebKit2/Target.pri 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/Target.pri 2012-02-21 10:57:13 UTC (rev 108328)
@@ -12,7 +12,7 @@
include(WebKit2.pri)
WEBKIT += wtf _javascript_core webcore
-QT += declarative quick widgets
+QT += declarative quick
CONFIG += staticlib
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp (108327 => 108328)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2012-02-21 10:57:13 UTC (rev 108328)
@@ -21,9 +21,9 @@
#include "../util.h"
#include "qquickwebview_p.h"
+#include <QGuiApplication>
#include <QVarLengthArray>
#include <QtQuickTest/quicktest.h>
-#include <QtWidgets/QApplication>
int main(int argc, char** argv)
{
@@ -42,7 +42,7 @@
// 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);
+ QGuiApplication app(argc, argv);
qmlRegisterType<ByteArrayTestData>("Test", 1, 0, "ByteArrayTestData");
#ifdef DISABLE_FLICKABLE_VIEWPORT
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (108327 => 108328)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2012-02-21 10:57:13 UTC (rev 108328)
@@ -356,7 +356,7 @@
QVERIFY(webView()->experimental()->contentY() == y);
}
-QTWEBKIT_API_TEST_MAIN(tst_QQuickWebView)
+QTEST_MAIN(tst_QQuickWebView)
#include "tst_qquickwebview.moc"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri (108327 => 108328)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri 2012-02-21 10:57:13 UTC (rev 108328)
@@ -9,7 +9,7 @@
../bytearraytestdata.cpp
INCLUDEPATH += $$PWD
-QT += testlib declarative widgets quick
+QT += testlib declarative quick
CONFIG += qtwebkit
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (108327 => 108328)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2012-02-21 10:57:13 UTC (rev 108328)
@@ -29,13 +29,3 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
void suppressDebugOutput();
-
-#define QTWEBKIT_API_TEST_MAIN(TestObject) \
-int main(int argc, char** argv) \
-{ \
- suppressDebugOutput(); \
- QApplication app(argc, argv); \
- QTEST_DISABLE_KEYPAD_NAVIGATION \
- TestObject tc; \
- return QTest::qExec(&tc, argc, argv); \
-}
Modified: trunk/Tools/ChangeLog (108327 => 108328)
--- trunk/Tools/ChangeLog 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/ChangeLog 2012-02-21 10:57:13 UTC (rev 108328)
@@ -1,3 +1,22 @@
+2012-02-21 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Get rid of the dependency to QtWidgets
+ https://bugs.webkit.org/show_bug.cgi?id=76276
+
+ Reviewed by Simon Hausmann.
+
+ * MiniBrowser/qt/MiniBrowser.pro:
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::MiniBrowserApplication):
+ (MiniBrowserApplication::notify):
+ (MiniBrowserApplication::sendTouchEvent):
+ * MiniBrowser/qt/MiniBrowserApplication.h:
+ (MiniBrowserApplication):
+ * QtTestBrowser/locationedit.h:
+ * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+ (WTR::activateFonts):
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+
2012-02-20 Adam Barth <[email protected]>
mastercfg_unittest.py fails without simplejson
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.pro (108327 => 108328)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-02-21 10:57:13 UTC (rev 108328)
@@ -24,7 +24,7 @@
CONFIG += qtwebkit qtwebkit-private
-QT += network declarative widgets quick
+QT += network declarative quick
macx: QT += xml
RESOURCES += MiniBrowser.qrc
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (108327 => 108328)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-02-21 10:57:13 UTC (rev 108328)
@@ -35,7 +35,6 @@
#include <QEvent>
#include <QMouseEvent>
#include <QTouchEvent>
-#include <QApplication>
static inline bool isTouchEvent(const QEvent* event)
{
@@ -63,13 +62,14 @@
}
MiniBrowserApplication::MiniBrowserApplication(int& argc, char** argv)
- : QApplication(argc, argv)
+ : QGuiApplication(argc, argv)
, m_realTouchEventReceived(false)
, m_pendingFakeTouchEventCount(0)
, m_isRobotized(false)
, m_robotTimeoutSeconds(0)
, m_robotExtraTimeSeconds(0)
, m_windowOptions(this)
+ , m_holdingControl(false)
{
setOrganizationName("Nokia");
setApplicationName("QtMiniBrowser");
@@ -80,23 +80,28 @@
bool MiniBrowserApplication::notify(QObject* target, QEvent* event)
{
+ if(QInputEvent* ie = static_cast<QInputEvent*>(event))
+ m_holdingControl = ie->modifiers().testFlag(Qt::ControlModifier);
+ else
+ m_holdingControl = false;
+
// We try to be smart, if we received real touch event, we are probably on a device
// with touch screen, and we should not have touch mocking.
if (!event->spontaneous() || m_realTouchEventReceived || !m_windowOptions.touchMockingEnabled())
- return QApplication::notify(target, event);
+ return QGuiApplication::notify(target, event);
if (isTouchEvent(event) && static_cast<QTouchEvent*>(event)->deviceType() == QTouchEvent::TouchScreen) {
if (m_pendingFakeTouchEventCount)
--m_pendingFakeTouchEventCount;
else
m_realTouchEventReceived = true;
- return QApplication::notify(target, event);
+ return QGuiApplication::notify(target, event);
}
BrowserWindow* browserWindow = qobject_cast<BrowserWindow*>(target);
if (!browserWindow)
- return QApplication::notify(target, event);
+ return QGuiApplication::notify(target, event);
// In QML events are propagated through parents. But since the WebView
// may consume key events, a shortcut might never reach the top QQuickItem.
@@ -139,16 +144,16 @@
break;
case QEvent::MouseMove:
if (!mouseEvent->buttons() || !m_touchPoints.contains(mouseEvent->buttons()))
- return QApplication::notify(target, event);
+ return QGuiApplication::notify(target, event);
touchPoint.id = mouseEvent->buttons();
touchPoint.state = Qt::TouchPointMoved;
break;
case QEvent::MouseButtonRelease:
touchPoint.state = Qt::TouchPointReleased;
touchPoint.id = mouseEvent->button();
- if (mouseEvent->modifiers().testFlag(Qt::ControlModifier)) {
+ if (m_holdingControl) {
m_heldTouchPoints.insert(touchPoint.id);
- return QApplication::notify(target, event);
+ return QGuiApplication::notify(target, event);
}
break;
default:
@@ -167,7 +172,7 @@
sendTouchEvent(browserWindow);
}
- return QApplication::notify(target, event);
+ return QGuiApplication::notify(target, event);
}
void MiniBrowserApplication::sendTouchEvent(BrowserWindow* browserWindow)
@@ -182,14 +187,13 @@
m_pendingFakeTouchEventCount++;
QWindowSystemInterface::handleTouchEvent(browserWindow, device, m_touchPoints.values());
- bool holdingControl = QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
if (QQuickWebViewExperimental::flickableViewportEnabled())
- browserWindow->updateVisualMockTouchPoints(holdingControl ? m_touchPoints.values() : QList<QWindowSystemInterface::TouchPoint>());
+ browserWindow->updateVisualMockTouchPoints(m_holdingControl ? m_touchPoints.values() : QList<QWindowSystemInterface::TouchPoint>());
// Get rid of touch-points that are no longer valid
foreach (const QWindowSystemInterface::TouchPoint& touchPoint, m_touchPoints) {
- if (touchPoint.state == Qt::TouchPointReleased)
- m_touchPoints.remove(touchPoint.id);
+ if (touchPoint.state == Qt::TouchPointReleased)
+ m_touchPoints.remove(touchPoint.id);
}
}
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (108327 => 108328)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-02-21 10:57:13 UTC (rev 108328)
@@ -33,7 +33,7 @@
#include <QObject>
#include <QStringList>
#include <QtDeclarative>
-#include <QtWidgets/QApplication>
+#include <QGuiApplication>
#include <QTouchEvent>
#include <QUrl>
#include "qwindowsysteminterface_qpa.h"
@@ -84,7 +84,7 @@
QSize m_windowSize;
};
-class MiniBrowserApplication : public QApplication {
+class MiniBrowserApplication : public QGuiApplication {
Q_OBJECT
public:
@@ -113,6 +113,7 @@
QSet<int> m_heldTouchPoints;
WindowOptions m_windowOptions;
+ bool m_holdingControl;
};
QML_DECLARE_TYPE(WindowOptions);
Modified: trunk/Tools/QtTestBrowser/locationedit.h (108327 => 108328)
--- trunk/Tools/QtTestBrowser/locationedit.h 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/QtTestBrowser/locationedit.h 2012-02-21 10:57:13 UTC (rev 108328)
@@ -28,8 +28,6 @@
#ifndef locationedit_h
#define locationedit_h
-#include <qconfig.h>
-
#ifndef QT_NO_INPUTDIALOG
#include <QApplication>
#include <QIcon>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (108327 => 108328)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2012-02-21 10:57:13 UTC (rev 108328)
@@ -33,7 +33,6 @@
#include "QtInitializeTestFonts.h"
#include <QApplication>
-#include <QWidget>
#include <QWindowsStyle>
namespace WTR {
@@ -41,11 +40,7 @@
void activateFonts()
{
WebKit::initializeTestFonts();
-
- QApplication::setGraphicsSystem(QLatin1String("raster"));
-#if HAVE(QSTYLE)
QApplication::setStyle(new QWindowsStyle);
-#endif
}
}
Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (108327 => 108328)
--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-02-21 10:57:13 UTC (rev 108328)
@@ -30,7 +30,7 @@
#include "qquickwebpage_p.h"
#include "qquickwebview_p.h"
-#include <QApplication>
+#include <QCoreApplication>
#include <QDeclarativeProperty>
#include <QEventLoop>
#include <QtQuick/QQuickView>
