Unreviewed, rolling out r96108, r96111, r96113, and r96116.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Sep 2011 17:27:12 +0000 (17:27 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Sep 2011 17:27:12 +0000 (17:27 +0000)
http://trac.webkit.org/changeset/96108
http://trac.webkit.org/changeset/96111
http://trac.webkit.org/changeset/96113
http://trac.webkit.org/changeset/96116
https://bugs.webkit.org/show_bug.cgi?id=68913

Wait for working Qt5 (Requested by ossy on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-09-27

.:

* Source/WebKit.pro:

Source/WebCore:

* WebCore.pri:
* platform/graphics/qt/GraphicsLayerQt.cpp:

Source/WebKit/qt:

* Api/qgraphicswebview.cpp:
* Api/qgraphicswebview.h:
* Api/qwebframe.h:
* Api/qwebhistory.h:
* Api/qwebpage.h:
* Api/qwebsettings.h:
* Api/qwebview.h:
* QtWebKit.pro:
* WebCoreSupport/PageClientQt.h:
* WebCoreSupport/QtWebComboBox.cpp:
* WebCoreSupport/QtWebComboBox.h:
* declarative/declarative.pro:
* declarative/qdeclarativewebview.cpp:
* declarative/qdeclarativewebview_p.h:
* docs/webkitsnippets/webpage/main.cpp:
* examples/platformplugin/WebNotificationPresenter.h:
* tests/tests.pri:

Source/WebKit2:

* UIProcess/API/qt/qdesktopwebview.cpp:
(QDesktopWebViewPrivate::startDrag):
(QDesktopWebViewPrivate::didChangeToolTip):
(QDesktopWebViewPrivate::didChangeCursor):
(QDesktopWebViewPrivate::showContextMenu):
(QDesktopWebViewPrivate::chooseFiles):
* UIProcess/API/qt/qdesktopwebview.h:
* UIProcess/API/qt/tests/tests.pri:
* UIProcess/API/qt/tests/tests.pro:
* UIProcess/qt/ViewInterface.h:
* UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:
(WebKit::WebPopupMenuProxyQtDesktop::WebPopupMenuProxyQtDesktop):

Tools:

* DumpRenderTree/qt/DumpRenderTree.pro:
* DumpRenderTree/qt/ImageDiff.pro:
* MiniBrowser/qt/BrowserView.cpp:
(BrowserView::BrowserView):
* MiniBrowser/qt/BrowserView.h:
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::urlChanged):
(BrowserWindow::~BrowserWindow):
* MiniBrowser/qt/BrowserWindow.h:
* MiniBrowser/qt/MiniBrowser.pro:
* MiniBrowser/qt/MiniBrowserApplication.h:
* MiniBrowser/qt/main.cpp:
* QtTestBrowser/QtTestBrowser.pro:
* QtTestBrowser/launcherwindow.cpp:
* QtTestBrowser/launcherwindow.h:
* QtTestBrowser/locationedit.h:
* QtTestBrowser/main.cpp:
* QtTestBrowser/mainwindow.cpp:
* QtTestBrowser/mainwindow.h:
* QtTestBrowser/webinspector.h:
* QtTestBrowser/webpage.cpp:
* QtTestBrowser/webview.cpp:
* WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/qt/EventSenderProxyQt.cpp:
* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
(WTR::WebView::wkView):
(WTR::WebView::pageRef):
(WTR::WebView::~WebView):
(WTR::WebView::WebView):
(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::sendEvent):
(WTR::PlatformWebView::postEvent):
* WebKitTestRunner/qt/WebKitTestRunner.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@96126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

55 files changed:
ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/WebCore.pri
Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
Source/WebKit.pro
Source/WebKit/qt/Api/qgraphicswebview.cpp
Source/WebKit/qt/Api/qgraphicswebview.h
Source/WebKit/qt/Api/qwebframe.h
Source/WebKit/qt/Api/qwebhistory.h
Source/WebKit/qt/Api/qwebpage.h
Source/WebKit/qt/Api/qwebsettings.h
Source/WebKit/qt/Api/qwebview.h
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/QtWebKit.pro
Source/WebKit/qt/WebCoreSupport/PageClientQt.h
Source/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp
Source/WebKit/qt/WebCoreSupport/QtWebComboBox.h
Source/WebKit/qt/declarative/declarative.pro
Source/WebKit/qt/declarative/qdeclarativewebview.cpp
Source/WebKit/qt/declarative/qdeclarativewebview_p.h
Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.h
Source/WebKit/qt/tests/tests.pri
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp
Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
Source/WebKit2/UIProcess/API/qt/tests/tests.pri
Source/WebKit2/UIProcess/API/qt/tests/tests.pro
Source/WebKit2/UIProcess/qt/ViewInterface.h
Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp
Tools/ChangeLog
Tools/DumpRenderTree/qt/DumpRenderTree.pro
Tools/DumpRenderTree/qt/ImageDiff.pro
Tools/MiniBrowser/qt/BrowserView.cpp
Tools/MiniBrowser/qt/BrowserView.h
Tools/MiniBrowser/qt/BrowserWindow.cpp
Tools/MiniBrowser/qt/BrowserWindow.h
Tools/MiniBrowser/qt/MiniBrowser.pro
Tools/MiniBrowser/qt/MiniBrowserApplication.h
Tools/MiniBrowser/qt/main.cpp
Tools/QtTestBrowser/QtTestBrowser.pro
Tools/QtTestBrowser/launcherwindow.cpp
Tools/QtTestBrowser/launcherwindow.h
Tools/QtTestBrowser/locationedit.h
Tools/QtTestBrowser/main.cpp
Tools/QtTestBrowser/mainwindow.cpp
Tools/QtTestBrowser/mainwindow.h
Tools/QtTestBrowser/webinspector.h
Tools/QtTestBrowser/webpage.cpp
Tools/QtTestBrowser/webview.cpp
Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
Tools/WebKitTestRunner/PlatformWebView.h
Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp
Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
Tools/WebKitTestRunner/qt/WebKitTestRunner.pro

index b29fb3d..76a0195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
+        http://trac.webkit.org/changeset/96108
+        http://trac.webkit.org/changeset/96111
+        http://trac.webkit.org/changeset/96113
+        http://trac.webkit.org/changeset/96116
+        https://bugs.webkit.org/show_bug.cgi?id=68913
+
+        Wait for working Qt5 (Requested by ossy on #webkit).
+
+        * Source/WebKit.pro:
+
 2011-09-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Fix build against Qt5 after refactor of widgets out of QtGUi
index 50fea1d..5ca35ed 100644 (file)
@@ -1,3 +1,17 @@
+2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
+        http://trac.webkit.org/changeset/96108
+        http://trac.webkit.org/changeset/96111
+        http://trac.webkit.org/changeset/96113
+        http://trac.webkit.org/changeset/96116
+        https://bugs.webkit.org/show_bug.cgi?id=68913
+
+        Wait for working Qt5 (Requested by ossy on #webkit).
+
+        * WebCore.pri:
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+
 2011-09-27  Csaba Osztrogonác  <ossy@webkit.org>
 
         Fix ENABLE(SQL_DATABASE)=0 build after r95919
index 869fead..ff978ee 100644 (file)
@@ -332,10 +332,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
 unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
 linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
-unix|win32-g++* {
-    QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
-    greaterThan(QT_MAJOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtWidgets
-}
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
 unix:!mac:!symbian:CONFIG += link_pkgconfig
 
 # Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
index 3609d85..6765799 100644 (file)
 #include "RefCounted.h"
 #include "TranslateTransformOperation.h"
 #include "UnitBezier.h"
-#include <qgraphicseffect.h>
-#include <qgraphicsitem.h>
-#include <qgraphicsscene.h>
-#include <qgraphicsview.h>
-#include <qgraphicswidget.h>
-#include <qstyleoption.h>
 #include <QtCore/qabstractanimation.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qset.h>
 #include <QtCore/qtimer.h>
 #include <QtGui/qcolor.h>
+#include <QtGui/qgraphicseffect.h>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qgraphicsscene.h>
+#include <QtGui/qgraphicsview.h>
+#include <QtGui/qgraphicswidget.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qpixmapcache.h>
+#include <QtGui/qstyleoption.h>
 
 #if ENABLE(TILED_BACKING_STORE)
 #include "TiledBackingStore.h"
index 169a4ee..741d476 100644 (file)
@@ -17,13 +17,6 @@ webkit2 {
     exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
 }
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    isEmpty(QT.widgets.name)|isEmpty(QT.printsupport.name) {
-        message("Building WebKit against Qt 5.0 requires the QtWidgets and QtPrintSupport modules.")
-        error("Aborting build.")
-    }
-}
-
 SUBDIRS += WebCore
 SUBDIRS += WebKit/qt/QtWebKit.pro
 
index e078ddc..2bd237f 100644 (file)
 #include "GraphicsContext.h"
 #include "IntRect.h"
 #include "TiledBackingStore.h"
-#include <qapplication.h>
-#include <qgraphicsscene.h>
-#include <qgraphicssceneevent.h>
-#include <qgraphicsview.h>
-#include <qscrollbar.h>
-#include <qstyleoption.h>
-#include <qinputcontext.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qtimer.h>
+#include <QtGui/qapplication.h>
+#include <QtGui/qgraphicsscene.h>
+#include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qgraphicsview.h>
 #include <QtGui/qpixmapcache.h>
-
+#include <QtGui/qscrollbar.h>
+#include <QtGui/qstyleoption.h>
+#include <QtGui/qinputcontext.h>
 #if defined(Q_WS_X11)
 #include <QX11Info>
 #endif
index 29e7ffd..ceb0ad8 100644 (file)
 #include "qwebkitglobal.h"
 #include "qwebpage.h"
 #include <QtCore/qurl.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qgraphicswidget.h>
-#include <QtWidgets/qicon.h>
-#else
+#include <QtGui/qevent.h>
 #include <QtGui/qgraphicswidget.h>
 #include <QtGui/qicon.h>
-#endif
-#include <QtGui/qevent.h>
 #include <QtGui/qpainter.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
 
index 35fce4b..262fe7d 100644 (file)
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qicon.h>
-#else
 #include <QtGui/qicon.h>
-#endif
 #include <QtScript/qscriptengine.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include "qwebkitglobal.h"
index 0d59041..3456784 100644 (file)
 
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
+#include <QtGui/qicon.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qshareddata.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qicon.h>
-#else
-#include <QtGui/qicon.h>
-#endif
 
 #include "qwebkitglobal.h"
 
index fd2fd4b..21083d8 100644 (file)
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qwidget.h>
-#else
 #include <QtGui/qwidget.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 class QNetworkProxy;
index 40f7f73..18787d5 100644 (file)
 
 #include <QtCore/qstring.h>
 #include <QtGui/qpixmap.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qicon.h>
-#else
 #include <QtGui/qicon.h>
-#endif
 #include <QtCore/qshareddata.h>
 
 namespace WebCore {
index 07e30d3..70ee1fa 100644 (file)
 
 #include "qwebkitglobal.h"
 #include "qwebpage.h"
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qwidget.h>
-#include <QtWidgets/qicon.h>
-#else
 #include <QtGui/qwidget.h>
 #include <QtGui/qicon.h>
-#endif
 #include <QtGui/qpainter.h>
 #include <QtCore/qurl.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
index 37ae59c..7c423ca 100644 (file)
@@ -1,3 +1,32 @@
+2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
+        http://trac.webkit.org/changeset/96108
+        http://trac.webkit.org/changeset/96111
+        http://trac.webkit.org/changeset/96113
+        http://trac.webkit.org/changeset/96116
+        https://bugs.webkit.org/show_bug.cgi?id=68913
+
+        Wait for working Qt5 (Requested by ossy on #webkit).
+
+        * Api/qgraphicswebview.cpp:
+        * Api/qgraphicswebview.h:
+        * Api/qwebframe.h:
+        * Api/qwebhistory.h:
+        * Api/qwebpage.h:
+        * Api/qwebsettings.h:
+        * Api/qwebview.h:
+        * QtWebKit.pro:
+        * WebCoreSupport/PageClientQt.h:
+        * WebCoreSupport/QtWebComboBox.cpp:
+        * WebCoreSupport/QtWebComboBox.h:
+        * declarative/declarative.pro:
+        * declarative/qdeclarativewebview.cpp:
+        * declarative/qdeclarativewebview_p.h:
+        * docs/webkitsnippets/webpage/main.cpp:
+        * examples/platformplugin/WebNotificationPresenter.h:
+        * tests/tests.pri:
+
 2011-09-27  Csaba Osztrogonác  <ossy@webkit.org>
 
         [Qt][WK2] Buildfix after r96108.
index 010a599..060ad9f 100644 (file)
@@ -41,7 +41,6 @@ webkit2:prependWebKit2Lib(../../WebKit2)
 # the generated includes are containing the dependencies.
 # It used to be in WebCore.pro but now that this is the main pro file it has to be here.
 QT += network
-greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
 
index c7b1439..d0f717f 100644 (file)
 #include "qwebframe_p.h"
 #include "qwebpage.h"
 #include "qwebpage_p.h"
-#include <qgraphicsscene.h>
-#include <qgraphicsview.h>
-#include <qgraphicswidget.h>
-#include <qscrollbar.h>
-#include <qstyleoption.h>
-#include <qwidget.h>
 #include <QtCore/qmetaobject.h>
+#include <QtGui/qgraphicsscene.h>
+#include <QtGui/qgraphicsview.h>
+#include <QtGui/qgraphicswidget.h>
+#include <QtGui/qscrollbar.h>
+#include <QtGui/qstyleoption.h>
+#include <QtGui/qwidget.h>
 
 #include <Settings.h>
 
index 8a06d64..b6347fc 100644 (file)
@@ -24,8 +24,8 @@
 
 #ifndef QT_NO_COMBOBOX
 
-#include <QAbstractItemView>
-#include <QApplication>
+#include <QtGui/QAbstractItemView>
+#include <QtGui/QApplication>
 #include <QtGui/QMouseEvent>
 
 namespace WebCore {
index bca2e5f..6cc5f21 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "Platform.h"
 
-#include <QComboBox>
+#include <QtGui/QComboBox>
 
 #ifndef QT_NO_COMBOBOX
 
index 4b89d89..6a3e24b 100644 (file)
@@ -40,7 +40,6 @@ symbian: {
 include(../../../WebKit.pri)
 
 QT += declarative
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 contains(QT_CONFIG, qtquick1): {
     QT += qtquick1
index 4bf6e15..22ee579 100644 (file)
 
 #include "qdeclarativewebview_p.h"
 
-#include <QApplication>
-#include <QGraphicsSceneMouseEvent>
 #include <QtCore/QDebug>
 #include <QtCore/QEvent>
 #include <QtCore/QFile>
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/qdeclarative.h>
+#include <QtGui/QApplication>
+#include <QtGui/QGraphicsSceneMouseEvent>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPen>
index 83463db..9fcd3ef 100644 (file)
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtQuick1/QDeclarativeItem>
-#include <QtWidgets/QAction>
 #else
 #include <QtDeclarative/QDeclarativeItem>
-#include <QtGui/QAction>
 #endif
 
+#include <QtGui/QAction>
 #include <QtNetwork/QNetworkAccessManager>
 #include "qgraphicswebview.h"
 #include "qwebpage.h"
index 491935a..393b16a 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <QApplication>
-#include <QPainter>
-#include <QWebFrame>
+#include <QtGui>
 #include <QWebPage>
+#include <QWebFrame>
 
 //! [0]
 class Thumbnailer : public QObject
index 4b1bb98..f46e5cb 100644 (file)
 #define WebNotificationPresenter_h
 
 #include "qwebkitplatformplugin.h"
-
-#include <QBitmap>
-#include <QEvent>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPainter>
-#include <QWidget>
+#include <QtGui>
 
 class WebNotificationWidget : public QWidget
 {
index fa83e1f..2b0c347 100644 (file)
@@ -21,7 +21,6 @@ INCLUDEPATH += \
 
 include(../../../WebKit.pri)
 QT += testlib network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 lessThan(QT_MAJOR_VERSION, 5) {
     contains(QT_CONFIG, declarative): QT += declarative
index bec55c1..ac3a8fd 100644 (file)
@@ -1,3 +1,27 @@
+2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
+        http://trac.webkit.org/changeset/96108
+        http://trac.webkit.org/changeset/96111
+        http://trac.webkit.org/changeset/96113
+        http://trac.webkit.org/changeset/96116
+        https://bugs.webkit.org/show_bug.cgi?id=68913
+
+        Wait for working Qt5 (Requested by ossy on #webkit).
+
+        * UIProcess/API/qt/qdesktopwebview.cpp:
+        (QDesktopWebViewPrivate::startDrag):
+        (QDesktopWebViewPrivate::didChangeToolTip):
+        (QDesktopWebViewPrivate::didChangeCursor):
+        (QDesktopWebViewPrivate::showContextMenu):
+        (QDesktopWebViewPrivate::chooseFiles):
+        * UIProcess/API/qt/qdesktopwebview.h:
+        * UIProcess/API/qt/tests/tests.pri:
+        * UIProcess/API/qt/tests/tests.pro:
+        * UIProcess/qt/ViewInterface.h:
+        * UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:
+        (WebKit::WebPopupMenuProxyQtDesktop::WebPopupMenuProxyQtDesktop):
+
 2011-09-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Rename WebKit2 GTK+ API main header as webkit2.h
index 27ed106..380214c 100644 (file)
@@ -23,8 +23,6 @@
 #include "qdesktopwebview_p.h"
 #include "qweberror.h"
 
-#include <QFileDialog>
-#include <QGraphicsSceneEvent>
 #include <QGraphicsSceneResizeEvent>
 #include <QStyleOptionGraphicsItem>
 #include <QtDeclarative/qdeclarativeengine.h>
@@ -33,8 +31,9 @@
 #include <QtDeclarative/qsgitem.h>
 #include <QtDeclarative/qsgview.h>
 #include <QtGui/QCursor>
-#include <QtGui/QDrag>
+#include <QtGui/QFileDialog>
 #include <QtGui/QFocusEvent>
+#include <QtGui/QGraphicsSceneEvent>
 #include <QtGui/QHoverEvent>
 #include <QtGui/QInputMethodEvent>
 #include <QtGui/QKeyEvent>
@@ -82,16 +81,16 @@ bool QDesktopWebViewPrivate::isVisible()
 
 void QDesktopWebViewPrivate::startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction)
 {
-    QWindow* window = q->canvas();
-    if (!window)
+    QWidget* widget = q->canvas();
+    if (!widget)
         return;
 
-    QDrag* drag = new QDrag(window);
+    QDrag* drag = new QDrag(widget);
     drag->setPixmap(QPixmap::fromImage(dragImage));
     drag->setMimeData(data);
     *dropAction = drag->exec(supportedDropActions);
     *globalPosition = QCursor::pos();
-    *clientPosition = window->mapFromGlobal(*globalPosition);
+    *clientPosition = widget->mapFromGlobal(*globalPosition);
 }
 
 void QDesktopWebViewPrivate::didReceiveViewportArguments(const WebCore::ViewportArguments&)
@@ -117,6 +116,7 @@ void QDesktopWebViewPrivate::didChangeTitle(const QString& newTitle)
 void QDesktopWebViewPrivate::didChangeToolTip(const QString& newToolTip)
 {
     // FIXME: Add a proper implementation when Qt 5 supports tooltip.
+    q->canvas()->setToolTip(newToolTip);
 }
 
 void QDesktopWebViewPrivate::didChangeStatusText(const QString& newMessage)
@@ -127,6 +127,7 @@ void QDesktopWebViewPrivate::didChangeStatusText(const QString& newMessage)
 void QDesktopWebViewPrivate::didChangeCursor(const QCursor& newCursor)
 {
     // FIXME: add proper cursor handling when Qt 5 supports it.
+    q->canvas()->setCursor(newCursor);
 }
 
 void QDesktopWebViewPrivate::loadDidBegin()
@@ -163,18 +164,15 @@ void QDesktopWebViewPrivate::showContextMenu(QSharedPointer<QMenu> menu)
     if (menu->isEmpty())
         return;
 
-    QWindow* window = q->canvas();
-    if (!window)
+    QWidget* widget = q->canvas();
+    if (!widget)
         return;
 
     activeMenu = menu;
 
-    activeMenu->window()->winId(); // Ensure that the menu has a window
-    Q_ASSERT(activeMenu->window()->windowHandle());
-    activeMenu->window()->windowHandle()->setTransientParent(window);
-
+    menu->setParent(widget, menu->windowFlags());
     QPoint menuPositionInScene = q->mapToScene(menu->pos()).toPoint();
-    menu->exec(window->mapToGlobal(menuPositionInScene));
+    menu->exec(widget->mapToGlobal(menuPositionInScene));
     // The last function to get out of exec() clear the local copy.
     if (activeMenu == menu)
         activeMenu.clear();
@@ -405,17 +403,8 @@ void QDesktopWebViewPrivate::chooseFiles(WKOpenPanelResultListenerRef listenerRe
     if (!selectedFileNames.isEmpty())
         selectedFileName = selectedFileNames.at(0);
 
-    Q_ASSERT(!fileDialog);
-
-    QWindow* window = q->canvas();
-    if (!window)
-        return;
-
-    fileDialog = new QFileDialog(0, QString(), selectedFileName);
-    fileDialog->window()->winId(); // Ensure that the dialog has a window
-    Q_ASSERT(fileDialog->window()->windowHandle());
-    fileDialog->window()->windowHandle()->setTransientParent(window);
-
+    QWidget* widget = q->canvas();
+    fileDialog = new QFileDialog(widget, QString(), selectedFileName);
     fileDialog->open(this, SLOT(onOpenPanelFilesSelected()));
 
     connect(fileDialog, SIGNAL(finished(int)), this, SLOT(onOpenPanelFinished(int)));
index 2a854a0..c1fb59f 100644 (file)
@@ -44,7 +44,7 @@ class QWheelEvent;
 QT_END_NAMESPACE
 
 namespace WTR {
-    class PlatformWebView;
+    class WebView;
 }
 
 class QWEBKIT_EXPORT QDesktopWebView : public QSGPaintedItem {
@@ -120,7 +120,7 @@ private:
 
     void init();
 
-    friend class WTR::PlatformWebView;
+    friend class WTR::WebView;
     friend class QDesktopWebViewPrivate;
     QDesktopWebViewPrivate *d;
 };
index 4dedabf..82ff76c 100644 (file)
@@ -11,7 +11,7 @@ SOURCES += $${TARGET}.cpp \
 INCLUDEPATH += $$PWD
 
 include(../../../../../WebKit.pri)
-QT += testlib declarative widgets
+QT += testlib declarative
 
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\" \
index 04c1d92..f229705 100644 (file)
@@ -1,3 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = qtouchwebview qdesktopwebview commonviewtests
-lessThan(QT_MAJOR_VERSION, 5): SUBDIRS += qmltests
+SUBDIRS = qtouchwebview qdesktopwebview commonviewtests qmltests
index 161d481..47e6919 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <QtCore/QSharedPointer>
 #include <QtCore/QSize>
-#include <QMenu>
+#include <QtGui/QMenu>
 #include <WebKit2/WKBase.h>
 
 class QWebError;
index a1b5bdd..dc0f206 100644 (file)
@@ -30,7 +30,7 @@
 #include "WebPopupItem.h"
 #include <QtDeclarative/QSGCanvas>
 #include <QtDeclarative/QSGItem>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 using namespace WebCore;
 
@@ -44,11 +44,7 @@ WebPopupMenuProxyQtDesktop::WebPopupMenuProxyQtDesktop(WebPopupMenuProxy::Client
     , m_selectedIndex(-1)
 {
     QtWebComboBox* comboBox = m_comboBox.data();
-
-    comboBox->window()->winId(); // Ensure that the combobox has a window
-    Q_ASSERT(comboBox->window()->windowHandle());
-    comboBox->window()->windowHandle()->setTransientParent(m_webViewItem->canvas());
-
+    comboBox->setParent(m_webViewItem->canvas());
     connect(comboBox, SIGNAL(activated(int)), SLOT(setSelectedIndex(int)));
     connect(comboBox, SIGNAL(didHide()), SLOT(onPopupMenuHidden()), Qt::QueuedConnection);
 }
index a969485..f54f93e 100644 (file)
@@ -1,3 +1,50 @@
+2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
+        http://trac.webkit.org/changeset/96108
+        http://trac.webkit.org/changeset/96111
+        http://trac.webkit.org/changeset/96113
+        http://trac.webkit.org/changeset/96116
+        https://bugs.webkit.org/show_bug.cgi?id=68913
+
+        Wait for working Qt5 (Requested by ossy on #webkit).
+
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * DumpRenderTree/qt/ImageDiff.pro:
+        * MiniBrowser/qt/BrowserView.cpp:
+        (BrowserView::BrowserView):
+        * MiniBrowser/qt/BrowserView.h:
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::urlChanged):
+        (BrowserWindow::~BrowserWindow):
+        * MiniBrowser/qt/BrowserWindow.h:
+        * MiniBrowser/qt/MiniBrowser.pro:
+        * MiniBrowser/qt/MiniBrowserApplication.h:
+        * MiniBrowser/qt/main.cpp:
+        * QtTestBrowser/QtTestBrowser.pro:
+        * QtTestBrowser/launcherwindow.cpp:
+        * QtTestBrowser/launcherwindow.h:
+        * QtTestBrowser/locationedit.h:
+        * QtTestBrowser/main.cpp:
+        * QtTestBrowser/mainwindow.cpp:
+        * QtTestBrowser/mainwindow.h:
+        * QtTestBrowser/webinspector.h:
+        * QtTestBrowser/webpage.cpp:
+        * QtTestBrowser/webview.cpp:
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+        * WebKitTestRunner/PlatformWebView.h:
+        * WebKitTestRunner/qt/EventSenderProxyQt.cpp:
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+        (WTR::WebView::wkView):
+        (WTR::WebView::pageRef):
+        (WTR::WebView::~WebView):
+        (WTR::WebView::WebView):
+        (WTR::PlatformWebView::PlatformWebView):
+        (WTR::PlatformWebView::sendEvent):
+        (WTR::PlatformWebView::postEvent):
+        * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
 2011-09-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Rename WebKit2 GTK+ API main header as webkit2.h
index 6eabf76..e81086a 100644 (file)
@@ -1,13 +1,6 @@
 TARGET = DumpRenderTree
 CONFIG  -= app_bundle
-!isEqual(QT_ARCH,sh4) {
-    greaterThan(QT_MAJOR_VERSION, 4):isEmpty(QT.uitools.name) {
-        message("QtUiTools library not found. QWidget plugin loading will be disabled")
-        DEFINES += QT_NO_UITOOLS
-    } else {
-        CONFIG += uitools
-    }
-}
+!isEqual(QT_ARCH,sh4): CONFIG += uitools
 
 BASEDIR = $$PWD/../
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
@@ -27,7 +20,6 @@ unix:!mac:!symbian:!embedded {
 
 QT = core gui network testlib
 macx: QT += xml
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
 
 HEADERS = $$BASEDIR/WorkQueue.h \
     DumpRenderTreeQt.h \
@@ -62,4 +54,4 @@ wince*: {
 DEFINES += USE_SYSTEM_MALLOC=1
 DEFINES -= QT_ASCII_CAST_WARNINGS
 
-RESOURCES = DumpRenderTree.qrc
+RESOURCES = DumpRenderTree.qrc
\ No newline at end of file
index 92ade71..b3d5181 100644 (file)
@@ -7,7 +7,6 @@ INCLUDEPATH += ../../../Source/JavaScriptCore
 DESTDIR = $$OUTPUT_DIR/bin
 
 QT = core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 SOURCES = ImageDiff.cpp
 
index 41cefc7..9313ec8 100644 (file)
@@ -36,7 +36,7 @@
 #include <qtouchwebpage.h>
 #include <qwebnavigationcontroller.h>
 
-BrowserView::BrowserView(bool useTouchWebView, QWindow* parent)
+BrowserView::BrowserView(bool useTouchWebView, QWidget* parent)
     : QSGCanvas(parent)
     , m_item(0)
 {
index 5029da4..d8dd062 100644 (file)
@@ -29,7 +29,6 @@
 #ifndef BrowserView_h
 #define BrowserView_h
 
-#include <QAction>
 #include <QtDeclarative/qsgcanvas.h>
 #include <qwebkittypes.h>
 
@@ -41,7 +40,7 @@ class BrowserView : public QSGCanvas {
     Q_OBJECT
 
 public:
-    BrowserView(bool useTouchWebView, QWindow* parent = 0);
+    BrowserView(bool useTouchWebView, QWidget* parent = 0);
     virtual ~BrowserView();
 
     void load(const QString&);
index f2f45ac..bf506a7 100644 (file)
@@ -42,36 +42,6 @@ static QWKPage* newPageFunction(QWKPage* page)
 }
 #endif
 
-WindowWrapper::WindowWrapper(QWindow* window, QWidget* widget)
-    : QWidget(widget)
-    , m_window(window)
-{
-    // Throttle resize events a bit
-    m_resizeTimer.setInterval(16);
-    m_resizeTimer.setSingleShot(true);
-    connect(&m_resizeTimer, SIGNAL(timeout()), this, SLOT(doResize()));
-    m_window->setWindowFlags(Qt::FramelessWindowHint);
-}
-
-void WindowWrapper::showEvent(QShowEvent* event)
-{
-    QWidget::showEvent(event);
-    m_window->setParent(window()->windowHandle());
-    m_window->show();
-}
-
-void WindowWrapper::resizeEvent(QResizeEvent* event)
-{
-    QWidget::resizeEvent(event);
-    if (!m_resizeTimer.isActive())
-        m_resizeTimer.start();
-}
-
-void WindowWrapper::doResize()
-{
-    m_window->setGeometry(QRect(mapTo(window(), QPoint(0, 0)), size()));
-}
-
 BrowserWindow::BrowserWindow(WindowOptions* options)
     : m_urlLoader(0)
     , m_browser(0)
@@ -99,8 +69,8 @@ BrowserWindow::BrowserWindow(WindowOptions* options)
         connect(desktopWebView, SIGNAL(linkHovered(QUrl, QString)), this, SLOT(onLinkHovered(QUrl, QString)));
     }
 
-    setCentralWidget(new WindowWrapper(m_browser, this));
-    centralWidget()->setFocus(Qt::OtherFocusReason);
+    this->setCentralWidget(m_browser);
+    m_browser->setFocus(Qt::OtherFocusReason);
 
     QMenu* fileMenu = menuBar()->addMenu("&File");
     fileMenu->addAction("New Window", this, SLOT(newWindow()), QKeySequence::New);
@@ -217,7 +187,7 @@ void BrowserWindow::onLoadProgressChanged(int progress)
 void BrowserWindow::urlChanged(const QUrl& url)
 {
     m_addressBar->setText(url.toString());
-    m_browser->requestActivateWindow();
+    m_browser->setFocus();
     m_browser->view()->setFocus(true);
 }
 
@@ -350,4 +320,5 @@ BrowserWindow::~BrowserWindow()
 {
     delete m_urlLoader;
     delete m_addressBar;
+    delete m_browser;
 }
index 2a85a00..d69f513 100644 (file)
 
 #include "MiniBrowserApplication.h"
 #include <QStringList>
-#include <QTimer>
+#include <QtGui>
 
 class UrlLoader;
 
-class WindowWrapper : public QWidget
-{
-    Q_OBJECT
-
-public:
-    WindowWrapper(QWindow* window, QWidget* widget = 0);
-
-protected:
-    void showEvent(QShowEvent* event);
-    void resizeEvent(QResizeEvent* event);
-
-private slots:
-    void doResize();
-
-private:
-    QWindow* m_window;
-    QTimer m_resizeTimer;
-};
-
 class BrowserWindow : public QMainWindow {
     Q_OBJECT
 
index c942162..3981511 100644 (file)
@@ -32,7 +32,6 @@ DESTDIR = $$OUTPUT_DIR/bin
 
 QT += network declarative
 macx:QT+=xml
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 linux-* {
     # From Creator's src/rpath.pri:
index 1fddc38..5697748 100644 (file)
 #ifndef MiniBrowserApplication_h
 #define MiniBrowserApplication_h
 
-#include <QApplication>
-#include <QFileDialog>
 #include <QHash>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMainWindow>
-#include <QMenu>
-#include <QMenuBar>
-#include <QShortcut>
-#include <QStatusBar>
 #include <QStringList>
-#include <QToolBar>
 #include <QTouchEvent>
-#include <QUrl>
+#include <QtGui>
 
 struct WindowOptions {
     WindowOptions()
index e90c4f7..2d578d8 100644 (file)
@@ -32,6 +32,7 @@
 #include "UrlLoader.h"
 #include <QLatin1String>
 #include <QRegExp>
+#include <QtGui>
 
 int main(int argc, char** argv)
 {
index 5b8d6a2..68cc8f9 100644 (file)
@@ -24,14 +24,7 @@ HEADERS += \
     fpstimer.h \
     cookiejar.h
 
-!isEqual(QT_ARCH,sh4) {
-    greaterThan(QT_MAJOR_VERSION, 4):isEmpty(QT.uitools.name) {
-        message("QtUiTools library not found. QWidget plugin loading will be disabled")
-        DEFINES += QT_NO_UITOOLS
-    } else {
-        CONFIG += uitools
-    }
-}
+!isEqual(QT_ARCH,sh4): CONFIG += uitools
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
 include(../../Source/WebKit.pri)
@@ -42,7 +35,6 @@ DESTDIR = $$OUTPUT_DIR/bin
 
 QT += network
 macx:QT+=xml
-greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
 
 unix:!mac:!symbian:!embedded {
     CONFIG += link_pkgconfig
index e1ddc5a..86f15fe 100644 (file)
 #include "cookiejar.h"
 #include "urlloader.h"
 
-#include <QApplication>
-#include <QCheckBox>
-#include <QComboBox>
 #include <QCoreApplication>
-#include <QDialogButtonBox>
-#include <QInputDialog>
-#include <QLabel>
-#ifndef QT_NO_LINEEDIT
-#include <QLineEdit>
-#endif
-#ifndef QT_NO_SHORTCUT
-#include <QMenuBar>
-#endif
-#include <QSlider>
-#include <QSplitter>
-#include <QStatusBar>
-#include <QToolButton>
-#include <QToolTip>
-#include <QVBoxLayout>
 
 #if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
 #include <QFileDialog>
index a3255f9..9a36fdf 100644 (file)
@@ -33,6 +33,7 @@
 #ifndef launcherwindow_h
 #define launcherwindow_h
 
+#include <QtGui>
 #include <QtNetwork/QNetworkRequest>
 
 #if defined(QT_CONFIGURED_WITH_OPENGL)
index abdd9b8..e8afe70 100644 (file)
 #include <qconfig.h>
 
 #ifndef QT_NO_INPUTDIALOG
-#include <QApplication>
-#include <QIcon>
-#include <QLabel>
-#include <QLineEdit>
-#include <QStyleOptionFrameV3>
-#include <QTimer>
+#include <QtGui>
 
 class LocationEdit : public QLineEdit {
     Q_OBJECT
index a9f7d13..fb42799 100644 (file)
 
 WindowOptions windowOptions;
 
-#include <QApplication>
+
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QFontDatabase>
 
+
 #if defined(Q_WS_X11)
 #include <fontconfig/fontconfig.h>
 #endif
index bc65fbe..dcd350d 100644 (file)
 #include "locationedit.h"
 #include "utils.h"
 
-#include <QAction>
-#ifndef QT_NO_INPUTDIALOG
-#include <QCompleter>
-#endif
-#ifndef QT_NO_FILEDIALOG
-#include <QFileDialog>
-#endif
-
 MainWindow::MainWindow()
     : m_page(new WebPage(this))
     , m_toolBar(0)
index a6a1bd2..f8baebc 100644 (file)
 #ifndef mainwindow_h
 #define mainwindow_h
 
+#include <QtGui>
 #include "webpage.h"
 
-#include <QMainWindow>
-#include <QStringListModel>
-#include <QToolBar>
-
 class LocationEdit;
 
 class MainWindow : public QMainWindow {
index c24ecbf..5cc7f8a 100644 (file)
@@ -28,6 +28,7 @@
 #ifndef webinspector_h
 #define webinspector_h
 
+#include <QtGui>
 #include "qwebinspector.h"
 
 class WebInspector : public QWebInspector {
index d255d06..9088ce2 100644 (file)
 
 #include "launcherwindow.h"
 
-#include <QAction>
-#include <QApplication>
 #include <QAuthenticator>
-#ifndef QT_NO_DESKTOPSERVICES
 #include <QDesktopServices>
-#endif
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QLayout>
-#ifndef QT_NO_LINEEDIT
-#include <QLineEdit>
-#endif
+#include <QtGui>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkProxy>
index 3ea98f9..8e33620 100644 (file)
 
 #include "webview.h"
 
-#include <QAction>
+#include <QtGui>
 #include <QGraphicsScene>
-#include <QGraphicsSceneContextMenuEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QMenu>
-#include <QScrollBar>
-#include <QTimer>
-
-#ifndef QT_NO_ANIMATION
-#include <QAbstractAnimation>
-#include <QAbstractTransition>
-#include <QFinalState>
-#include <QPropertyAnimation>
-#include <QState>
-#include <QStateMachine>
-#endif
 
 WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent)
     : QGraphicsView(parent)
index 62221a4..baf0fca 100644 (file)
@@ -9,7 +9,6 @@ CONFIG(standalone_package) {
 }
 
 QT += declarative
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 GENERATED_SOURCES_DIR = ../../generated
 
index 5284e87..6f412c5 100644 (file)
 #define PlatformWebView_h
 
 #if defined(BUILDING_QT__)
-class QDesktopWebView;
-typedef QDesktopWebView* PlatformWKView;
-class QSGCanvas;
-typedef QSGCanvas* PlatformWindow;
+namespace WTR {
+class WebView;
+}
+typedef WTR::WebView* PlatformWKView;
+class QMainWindow;
+typedef QMainWindow* PlatformWindow;
 #elif defined(__APPLE__) && __APPLE__
 #if __OBJC__
 @class WKView;
index 09d40c6..fe22080 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "PlatformWebView.h"
 #include "TestController.h"
-#include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 #include <QtTest/QtTest>
 #include <WebKit2/WKPagePrivate.h>
index f1e0b69..81ae9d2 100644 (file)
 
 #include "PlatformWebView.h"
 #include "qdesktopwebview.h"
-
-#include <QApplication>
 #include <QtDeclarative/qsgcanvas.h>
+#include <QtGui>
 
 namespace WTR {
 
+class WebView : public QSGCanvas {
+public:
+    WebView(WKContextRef, WKPageGroupRef);
+
+    QDesktopWebView* wkView() const { return m_item; }
+    WKPageRef pageRef() const { return m_item->pageRef(); }
+
+    virtual ~WebView() { delete m_item; }
+
+private:
+    QDesktopWebView* m_item;
+};
+
+WebView::WebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+    : m_item(new QDesktopWebView(contextRef, pageGroupRef, rootItem()))
+{
+    m_item->setWidth(800);
+    m_item->setHeight(600);
+}
+
 PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
-    : m_view(new QDesktopWebView(contextRef, pageGroupRef))
-    , m_window(new QSGCanvas)
+    : m_view(new WebView(contextRef, pageGroupRef))
+    , m_window(new QMainWindow())
 {
-    m_view->setParent(m_window->rootItem());
+    m_view->setParent(m_window);
+    m_window->setCentralWidget(m_view);
     m_window->setGeometry(0, 0, 800, 600);
 
     QFocusEvent ev(QEvent::WindowActivate);
     QApplication::sendEvent(m_view, &ev);
-    m_view->setFocus(Qt::OtherFocusReason);
+    m_view->wkView()->setFocus(Qt::OtherFocusReason);
 }
 
 PlatformWebView::~PlatformWebView()
@@ -84,12 +104,12 @@ void PlatformWebView::setWindowFrame(WKRect wkRect)
 
 bool PlatformWebView::sendEvent(QEvent* event)
 {
-    return QCoreApplication::sendEvent(m_view, event);
+    return QCoreApplication::sendEvent(m_view->wkView(), event);
 }
 
 void PlatformWebView::postEvent(QEvent* event)
 {
-    QCoreApplication::postEvent(m_view, event);
+    QCoreApplication::postEvent(m_view->wkView(), event);
 }
 
 } // namespace WTR
index 92e3534..c5ad1a8 100644 (file)
@@ -32,7 +32,6 @@ unix:!mac:!symbian:!embedded {
 }
 
 QT = core gui network declarative testlib
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 HEADERS = \
     $$BASEDIR/EventSenderProxy.h \