Changeset 96126 in webkit


Ignore:
Timestamp:
Sep 27, 2011 10:27:12 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

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).

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:
Location:
trunk
Files:
55 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r96108 r96126  
     12011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
     4        http://trac.webkit.org/changeset/96108
     5        http://trac.webkit.org/changeset/96111
     6        http://trac.webkit.org/changeset/96113
     7        http://trac.webkit.org/changeset/96116
     8        https://bugs.webkit.org/show_bug.cgi?id=68913
     9
     10        Wait for working Qt5 (Requested by ossy on #webkit).
     11
     12        * Source/WebKit.pro:
     13
    1142011-09-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    215
  • trunk/Source/WebCore/ChangeLog

    r96123 r96126  
     12011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
     4        http://trac.webkit.org/changeset/96108
     5        http://trac.webkit.org/changeset/96111
     6        http://trac.webkit.org/changeset/96113
     7        http://trac.webkit.org/changeset/96116
     8        https://bugs.webkit.org/show_bug.cgi?id=68913
     9
     10        Wait for working Qt5 (Requested by ossy on #webkit).
     11
     12        * WebCore.pri:
     13        * platform/graphics/qt/GraphicsLayerQt.cpp:
     14
    1152011-09-27  Csaba Osztrogonác  <ossy@webkit.org>
    216
  • trunk/Source/WebCore/WebCore.pri

    r96108 r96126  
    333333linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
    334334
    335 unix|win32-g++* {
    336     QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
    337     greaterThan(QT_MAJOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtWidgets
    338 }
     335unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
    339336unix:!mac:!symbian:CONFIG += link_pkgconfig
    340337
  • trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp

    r96108 r96126  
    3030#include "TranslateTransformOperation.h"
    3131#include "UnitBezier.h"
    32 #include <qgraphicseffect.h>
    33 #include <qgraphicsitem.h>
    34 #include <qgraphicsscene.h>
    35 #include <qgraphicsview.h>
    36 #include <qgraphicswidget.h>
    37 #include <qstyleoption.h>
    3832#include <QtCore/qabstractanimation.h>
    3933#include <QtCore/qdatetime.h>
     
    4337#include <QtCore/qtimer.h>
    4438#include <QtGui/qcolor.h>
     39#include <QtGui/qgraphicseffect.h>
     40#include <QtGui/qgraphicsitem.h>
     41#include <QtGui/qgraphicsscene.h>
     42#include <QtGui/qgraphicsview.h>
     43#include <QtGui/qgraphicswidget.h>
    4544#include <QtGui/qpainter.h>
    4645#include <QtGui/qpixmap.h>
    4746#include <QtGui/qpixmapcache.h>
     47#include <QtGui/qstyleoption.h>
    4848
    4949#if ENABLE(TILED_BACKING_STORE)
  • trunk/Source/WebKit.pro

    r96108 r96126  
    1616    }
    1717    exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
    18 }
    19 
    20 greaterThan(QT_MAJOR_VERSION, 4) {
    21     isEmpty(QT.widgets.name)|isEmpty(QT.printsupport.name) {
    22         message("Building WebKit against Qt 5.0 requires the QtWidgets and QtPrintSupport modules.")
    23         error("Aborting build.")
    24     }
    2518}
    2619
  • trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp

    r96108 r96126  
    3535#include "IntRect.h"
    3636#include "TiledBackingStore.h"
    37 #include <qapplication.h>
    38 #include <qgraphicsscene.h>
    39 #include <qgraphicssceneevent.h>
    40 #include <qgraphicsview.h>
    41 #include <qscrollbar.h>
    42 #include <qstyleoption.h>
    43 #include <qinputcontext.h>
    4437#include <QtCore/qmetaobject.h>
    4538#include <QtCore/qsharedpointer.h>
    4639#include <QtCore/qtimer.h>
     40#include <QtGui/qapplication.h>
     41#include <QtGui/qgraphicsscene.h>
     42#include <QtGui/qgraphicssceneevent.h>
     43#include <QtGui/qgraphicsview.h>
    4744#include <QtGui/qpixmapcache.h>
    48 
     45#include <QtGui/qscrollbar.h>
     46#include <QtGui/qstyleoption.h>
     47#include <QtGui/qinputcontext.h>
    4948#if defined(Q_WS_X11)
    5049#include <QX11Info>
  • trunk/Source/WebKit/qt/Api/qgraphicswebview.h

    r96108 r96126  
    2424#include "qwebpage.h"
    2525#include <QtCore/qurl.h>
    26 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    27 #include <QtWidgets/qgraphicswidget.h>
    28 #include <QtWidgets/qicon.h>
    29 #else
     26#include <QtGui/qevent.h>
    3027#include <QtGui/qgraphicswidget.h>
    3128#include <QtGui/qicon.h>
    32 #endif
    33 #include <QtGui/qevent.h>
    3429#include <QtGui/qpainter.h>
    3530#include <QtNetwork/qnetworkaccessmanager.h>
  • trunk/Source/WebKit/qt/Api/qwebframe.h

    r96108 r96126  
    2525#include <QtCore/qurl.h>
    2626#include <QtCore/qvariant.h>
    27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    28 #include <QtWidgets/qicon.h>
    29 #else
    3027#include <QtGui/qicon.h>
    31 #endif
    3228#include <QtScript/qscriptengine.h>
    3329#include <QtNetwork/qnetworkaccessmanager.h>
  • trunk/Source/WebKit/qt/Api/qwebhistory.h

    r96108 r96126  
    2323#include <QtCore/qurl.h>
    2424#include <QtCore/qstring.h>
     25#include <QtGui/qicon.h>
    2526#include <QtCore/qdatetime.h>
    2627#include <QtCore/qshareddata.h>
    27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    28 #include <QtWidgets/qicon.h>
    29 #else
    30 #include <QtGui/qicon.h>
    31 #endif
    3228
    3329#include "qwebkitglobal.h"
  • trunk/Source/WebKit/qt/Api/qwebpage.h

    r96108 r96126  
    2727#include <QtCore/qobject.h>
    2828#include <QtCore/qurl.h>
    29 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    30 #include <QtWidgets/qwidget.h>
    31 #else
    3229#include <QtGui/qwidget.h>
    33 #endif
    3430
    3531QT_BEGIN_NAMESPACE
  • trunk/Source/WebKit/qt/Api/qwebsettings.h

    r96108 r96126  
    2525#include <QtCore/qstring.h>
    2626#include <QtGui/qpixmap.h>
    27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    28 #include <QtWidgets/qicon.h>
    29 #else
    3027#include <QtGui/qicon.h>
    31 #endif
    3228#include <QtCore/qshareddata.h>
    3329
  • trunk/Source/WebKit/qt/Api/qwebview.h

    r96108 r96126  
    2424#include "qwebkitglobal.h"
    2525#include "qwebpage.h"
    26 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    27 #include <QtWidgets/qwidget.h>
    28 #include <QtWidgets/qicon.h>
    29 #else
    3026#include <QtGui/qwidget.h>
    3127#include <QtGui/qicon.h>
    32 #endif
    3328#include <QtGui/qpainter.h>
    3429#include <QtCore/qurl.h>
  • trunk/Source/WebKit/qt/ChangeLog

    r96116 r96126  
     12011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
     4        http://trac.webkit.org/changeset/96108
     5        http://trac.webkit.org/changeset/96111
     6        http://trac.webkit.org/changeset/96113
     7        http://trac.webkit.org/changeset/96116
     8        https://bugs.webkit.org/show_bug.cgi?id=68913
     9
     10        Wait for working Qt5 (Requested by ossy on #webkit).
     11
     12        * Api/qgraphicswebview.cpp:
     13        * Api/qgraphicswebview.h:
     14        * Api/qwebframe.h:
     15        * Api/qwebhistory.h:
     16        * Api/qwebpage.h:
     17        * Api/qwebsettings.h:
     18        * Api/qwebview.h:
     19        * QtWebKit.pro:
     20        * WebCoreSupport/PageClientQt.h:
     21        * WebCoreSupport/QtWebComboBox.cpp:
     22        * WebCoreSupport/QtWebComboBox.h:
     23        * declarative/declarative.pro:
     24        * declarative/qdeclarativewebview.cpp:
     25        * declarative/qdeclarativewebview_p.h:
     26        * docs/webkitsnippets/webpage/main.cpp:
     27        * examples/platformplugin/WebNotificationPresenter.h:
     28        * tests/tests.pri:
     29
    1302011-09-27  Csaba Osztrogonác  <ossy@webkit.org>
    231
  • trunk/Source/WebKit/qt/QtWebKit.pro

    r96108 r96126  
    4242# It used to be in WebCore.pro but now that this is the main pro file it has to be here.
    4343QT += network
    44 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
    4544
    4645isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
  • trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h

    r96108 r96126  
    3232#include "qwebpage.h"
    3333#include "qwebpage_p.h"
    34 #include <qgraphicsscene.h>
    35 #include <qgraphicsview.h>
    36 #include <qgraphicswidget.h>
    37 #include <qscrollbar.h>
    38 #include <qstyleoption.h>
    39 #include <qwidget.h>
    4034#include <QtCore/qmetaobject.h>
     35#include <QtGui/qgraphicsscene.h>
     36#include <QtGui/qgraphicsview.h>
     37#include <QtGui/qgraphicswidget.h>
     38#include <QtGui/qscrollbar.h>
     39#include <QtGui/qstyleoption.h>
     40#include <QtGui/qwidget.h>
    4141
    4242#include <Settings.h>
  • trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp

    r96108 r96126  
    2525#ifndef QT_NO_COMBOBOX
    2626
    27 #include <QAbstractItemView>
    28 #include <QApplication>
     27#include <QtGui/QAbstractItemView>
     28#include <QtGui/QApplication>
    2929#include <QtGui/QMouseEvent>
    3030
  • trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.h

    r96108 r96126  
    2424#include "Platform.h"
    2525
    26 #include <QComboBox>
     26#include <QtGui/QComboBox>
    2727
    2828#ifndef QT_NO_COMBOBOX
  • trunk/Source/WebKit/qt/declarative/declarative.pro

    r96113 r96126  
    4141
    4242QT += declarative
    43 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    4443
    4544contains(QT_CONFIG, qtquick1): {
  • trunk/Source/WebKit/qt/declarative/qdeclarativewebview.cpp

    r96108 r96126  
    2121#include "qdeclarativewebview_p.h"
    2222
    23 #include <QApplication>
    24 #include <QGraphicsSceneMouseEvent>
    2523#include <QtCore/QDebug>
    2624#include <QtCore/QEvent>
     
    2927#include <QtDeclarative/QDeclarativeEngine>
    3028#include <QtDeclarative/qdeclarative.h>
     29#include <QtGui/QApplication>
     30#include <QtGui/QGraphicsSceneMouseEvent>
    3131#include <QtGui/QKeyEvent>
    3232#include <QtGui/QMouseEvent>
  • trunk/Source/WebKit/qt/declarative/qdeclarativewebview_p.h

    r96108 r96126  
    2727#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    2828#include <QtQuick1/QDeclarativeItem>
    29 #include <QtWidgets/QAction>
    3029#else
    3130#include <QtDeclarative/QDeclarativeItem>
     31#endif
     32
    3233#include <QtGui/QAction>
    33 #endif
    34 
    3534#include <QtNetwork/QNetworkAccessManager>
    3635#include "qgraphicswebview.h"
  • trunk/Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp

    r96108 r96126  
    1818*/
    1919
    20 #include <QApplication>
    21 #include <QPainter>
     20#include <QtGui>
     21#include <QWebPage>
    2222#include <QWebFrame>
    23 #include <QWebPage>
    2423
    2524//! [0]
  • trunk/Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.h

    r96108 r96126  
    2323
    2424#include "qwebkitplatformplugin.h"
    25 
    26 #include <QBitmap>
    27 #include <QEvent>
    28 #include <QGridLayout>
    29 #include <QLabel>
    30 #include <QPainter>
    31 #include <QWidget>
     25#include <QtGui>
    3226
    3327class WebNotificationWidget : public QWidget
  • trunk/Source/WebKit/qt/tests/tests.pri

    r96116 r96126  
    2222include(../../../WebKit.pri)
    2323QT += testlib network
    24 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    2524
    2625lessThan(QT_MAJOR_VERSION, 5) {
  • trunk/Source/WebKit2/ChangeLog

    r96121 r96126  
     12011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
     4        http://trac.webkit.org/changeset/96108
     5        http://trac.webkit.org/changeset/96111
     6        http://trac.webkit.org/changeset/96113
     7        http://trac.webkit.org/changeset/96116
     8        https://bugs.webkit.org/show_bug.cgi?id=68913
     9
     10        Wait for working Qt5 (Requested by ossy on #webkit).
     11
     12        * UIProcess/API/qt/qdesktopwebview.cpp:
     13        (QDesktopWebViewPrivate::startDrag):
     14        (QDesktopWebViewPrivate::didChangeToolTip):
     15        (QDesktopWebViewPrivate::didChangeCursor):
     16        (QDesktopWebViewPrivate::showContextMenu):
     17        (QDesktopWebViewPrivate::chooseFiles):
     18        * UIProcess/API/qt/qdesktopwebview.h:
     19        * UIProcess/API/qt/tests/tests.pri:
     20        * UIProcess/API/qt/tests/tests.pro:
     21        * UIProcess/qt/ViewInterface.h:
     22        * UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:
     23        (WebKit::WebPopupMenuProxyQtDesktop::WebPopupMenuProxyQtDesktop):
     24
    1252011-09-27  Carlos Garcia Campos  <cgarcia@igalia.com>
    226
  • trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp

    r96108 r96126  
    2424#include "qweberror.h"
    2525
    26 #include <QFileDialog>
    27 #include <QGraphicsSceneEvent>
    2826#include <QGraphicsSceneResizeEvent>
    2927#include <QStyleOptionGraphicsItem>
     
    3432#include <QtDeclarative/qsgview.h>
    3533#include <QtGui/QCursor>
    36 #include <QtGui/QDrag>
     34#include <QtGui/QFileDialog>
    3735#include <QtGui/QFocusEvent>
     36#include <QtGui/QGraphicsSceneEvent>
    3837#include <QtGui/QHoverEvent>
    3938#include <QtGui/QInputMethodEvent>
     
    8382void QDesktopWebViewPrivate::startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction)
    8483{
    85     QWindow* window = q->canvas();
    86     if (!window)
     84    QWidget* widget = q->canvas();
     85    if (!widget)
    8786        return;
    8887
    89     QDrag* drag = new QDrag(window);
     88    QDrag* drag = new QDrag(widget);
    9089    drag->setPixmap(QPixmap::fromImage(dragImage));
    9190    drag->setMimeData(data);
    9291    *dropAction = drag->exec(supportedDropActions);
    9392    *globalPosition = QCursor::pos();
    94     *clientPosition = window->mapFromGlobal(*globalPosition);
     93    *clientPosition = widget->mapFromGlobal(*globalPosition);
    9594}
    9695
     
    118117{
    119118    // FIXME: Add a proper implementation when Qt 5 supports tooltip.
     119    q->canvas()->setToolTip(newToolTip);
    120120}
    121121
     
    128128{
    129129    // FIXME: add proper cursor handling when Qt 5 supports it.
     130    q->canvas()->setCursor(newCursor);
    130131}
    131132
     
    164165        return;
    165166
    166     QWindow* window = q->canvas();
    167     if (!window)
     167    QWidget* widget = q->canvas();
     168    if (!widget)
    168169        return;
    169170
    170171    activeMenu = menu;
    171172
    172     activeMenu->window()->winId(); // Ensure that the menu has a window
    173     Q_ASSERT(activeMenu->window()->windowHandle());
    174     activeMenu->window()->windowHandle()->setTransientParent(window);
    175 
     173    menu->setParent(widget, menu->windowFlags());
    176174    QPoint menuPositionInScene = q->mapToScene(menu->pos()).toPoint();
    177     menu->exec(window->mapToGlobal(menuPositionInScene));
     175    menu->exec(widget->mapToGlobal(menuPositionInScene));
    178176    // The last function to get out of exec() clear the local copy.
    179177    if (activeMenu == menu)
     
    406404        selectedFileName = selectedFileNames.at(0);
    407405
    408     Q_ASSERT(!fileDialog);
    409 
    410     QWindow* window = q->canvas();
    411     if (!window)
    412         return;
    413 
    414     fileDialog = new QFileDialog(0, QString(), selectedFileName);
    415     fileDialog->window()->winId(); // Ensure that the dialog has a window
    416     Q_ASSERT(fileDialog->window()->windowHandle());
    417     fileDialog->window()->windowHandle()->setTransientParent(window);
    418 
     406    QWidget* widget = q->canvas();
     407    fileDialog = new QFileDialog(widget, QString(), selectedFileName);
    419408    fileDialog->open(this, SLOT(onOpenPanelFilesSelected()));
    420409
  • trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h

    r96108 r96126  
    4545
    4646namespace WTR {
    47     class PlatformWebView;
     47    class WebView;
    4848}
    4949
     
    121121    void init();
    122122
    123     friend class WTR::PlatformWebView;
     123    friend class WTR::WebView;
    124124    friend class QDesktopWebViewPrivate;
    125125    QDesktopWebViewPrivate *d;
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri

    r96111 r96126  
    1212
    1313include(../../../../../WebKit.pri)
    14 QT += testlib declarative widgets
     14QT += testlib declarative
    1515
    1616QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pro

    r96108 r96126  
    11TEMPLATE = subdirs
    2 SUBDIRS = qtouchwebview qdesktopwebview commonviewtests
    3 lessThan(QT_MAJOR_VERSION, 5): SUBDIRS += qmltests
     2SUBDIRS = qtouchwebview qdesktopwebview commonviewtests qmltests
  • trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h

    r96108 r96126  
    2424#include <QtCore/QSharedPointer>
    2525#include <QtCore/QSize>
    26 #include <QMenu>
     26#include <QtGui/QMenu>
    2727#include <WebKit2/WKBase.h>
    2828
  • trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp

    r96108 r96126  
    3131#include <QtDeclarative/QSGCanvas>
    3232#include <QtDeclarative/QSGItem>
    33 #include <QStandardItemModel>
     33#include <QtGui/QStandardItemModel>
    3434
    3535using namespace WebCore;
     
    4545{
    4646    QtWebComboBox* comboBox = m_comboBox.data();
    47 
    48     comboBox->window()->winId(); // Ensure that the combobox has a window
    49     Q_ASSERT(comboBox->window()->windowHandle());
    50     comboBox->window()->windowHandle()->setTransientParent(m_webViewItem->canvas());
    51 
     47    comboBox->setParent(m_webViewItem->canvas());
    5248    connect(comboBox, SIGNAL(activated(int)), SLOT(setSelectedIndex(int)));
    5349    connect(comboBox, SIGNAL(didHide()), SLOT(onPopupMenuHidden()), Qt::QueuedConnection);
  • trunk/Tools/ChangeLog

    r96121 r96126  
     12011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96108, r96111, r96113, and r96116.
     4        http://trac.webkit.org/changeset/96108
     5        http://trac.webkit.org/changeset/96111
     6        http://trac.webkit.org/changeset/96113
     7        http://trac.webkit.org/changeset/96116
     8        https://bugs.webkit.org/show_bug.cgi?id=68913
     9
     10        Wait for working Qt5 (Requested by ossy on #webkit).
     11
     12        * DumpRenderTree/qt/DumpRenderTree.pro:
     13        * DumpRenderTree/qt/ImageDiff.pro:
     14        * MiniBrowser/qt/BrowserView.cpp:
     15        (BrowserView::BrowserView):
     16        * MiniBrowser/qt/BrowserView.h:
     17        * MiniBrowser/qt/BrowserWindow.cpp:
     18        (BrowserWindow::BrowserWindow):
     19        (BrowserWindow::urlChanged):
     20        (BrowserWindow::~BrowserWindow):
     21        * MiniBrowser/qt/BrowserWindow.h:
     22        * MiniBrowser/qt/MiniBrowser.pro:
     23        * MiniBrowser/qt/MiniBrowserApplication.h:
     24        * MiniBrowser/qt/main.cpp:
     25        * QtTestBrowser/QtTestBrowser.pro:
     26        * QtTestBrowser/launcherwindow.cpp:
     27        * QtTestBrowser/launcherwindow.h:
     28        * QtTestBrowser/locationedit.h:
     29        * QtTestBrowser/main.cpp:
     30        * QtTestBrowser/mainwindow.cpp:
     31        * QtTestBrowser/mainwindow.h:
     32        * QtTestBrowser/webinspector.h:
     33        * QtTestBrowser/webpage.cpp:
     34        * QtTestBrowser/webview.cpp:
     35        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
     36        * WebKitTestRunner/PlatformWebView.h:
     37        * WebKitTestRunner/qt/EventSenderProxyQt.cpp:
     38        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
     39        (WTR::WebView::wkView):
     40        (WTR::WebView::pageRef):
     41        (WTR::WebView::~WebView):
     42        (WTR::WebView::WebView):
     43        (WTR::PlatformWebView::PlatformWebView):
     44        (WTR::PlatformWebView::sendEvent):
     45        (WTR::PlatformWebView::postEvent):
     46        * WebKitTestRunner/qt/WebKitTestRunner.pro:
     47
    1482011-09-27  Carlos Garcia Campos  <cgarcia@igalia.com>
    249
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r96108 r96126  
    11TARGET = DumpRenderTree
    22CONFIG  -= app_bundle
    3 !isEqual(QT_ARCH,sh4) {
    4     greaterThan(QT_MAJOR_VERSION, 4):isEmpty(QT.uitools.name) {
    5         message("QtUiTools library not found. QWidget plugin loading will be disabled")
    6         DEFINES += QT_NO_UITOOLS
    7     } else {
    8         CONFIG += uitools
    9     }
    10 }
     3!isEqual(QT_ARCH,sh4): CONFIG += uitools
    114
    125BASEDIR = $$PWD/../
     
    2821QT = core gui network testlib
    2922macx: QT += xml
    30 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
    3123
    3224HEADERS = $$BASEDIR/WorkQueue.h \
  • trunk/Tools/DumpRenderTree/qt/ImageDiff.pro

    r96108 r96126  
    88
    99QT = core gui
    10 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    1110
    1211SOURCES = ImageDiff.cpp
  • trunk/Tools/MiniBrowser/qt/BrowserView.cpp

    r96108 r96126  
    3737#include <qwebnavigationcontroller.h>
    3838
    39 BrowserView::BrowserView(bool useTouchWebView, QWindow* parent)
     39BrowserView::BrowserView(bool useTouchWebView, QWidget* parent)
    4040    : QSGCanvas(parent)
    4141    , m_item(0)
  • trunk/Tools/MiniBrowser/qt/BrowserView.h

    r96108 r96126  
    3030#define BrowserView_h
    3131
    32 #include <QAction>
    3332#include <QtDeclarative/qsgcanvas.h>
    3433#include <qwebkittypes.h>
     
    4241
    4342public:
    44     BrowserView(bool useTouchWebView, QWindow* parent = 0);
     43    BrowserView(bool useTouchWebView, QWidget* parent = 0);
    4544    virtual ~BrowserView();
    4645
  • trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

    r96108 r96126  
    4343#endif
    4444
    45 WindowWrapper::WindowWrapper(QWindow* window, QWidget* widget)
    46     : QWidget(widget)
    47     , m_window(window)
    48 {
    49     // Throttle resize events a bit
    50     m_resizeTimer.setInterval(16);
    51     m_resizeTimer.setSingleShot(true);
    52     connect(&m_resizeTimer, SIGNAL(timeout()), this, SLOT(doResize()));
    53     m_window->setWindowFlags(Qt::FramelessWindowHint);
    54 }
    55 
    56 void WindowWrapper::showEvent(QShowEvent* event)
    57 {
    58     QWidget::showEvent(event);
    59     m_window->setParent(window()->windowHandle());
    60     m_window->show();
    61 }
    62 
    63 void WindowWrapper::resizeEvent(QResizeEvent* event)
    64 {
    65     QWidget::resizeEvent(event);
    66     if (!m_resizeTimer.isActive())
    67         m_resizeTimer.start();
    68 }
    69 
    70 void WindowWrapper::doResize()
    71 {
    72     m_window->setGeometry(QRect(mapTo(window(), QPoint(0, 0)), size()));
    73 }
    74 
    7545BrowserWindow::BrowserWindow(WindowOptions* options)
    7646    : m_urlLoader(0)
     
    10070    }
    10171
    102     setCentralWidget(new WindowWrapper(m_browser, this));
    103     centralWidget()->setFocus(Qt::OtherFocusReason);
     72    this->setCentralWidget(m_browser);
     73    m_browser->setFocus(Qt::OtherFocusReason);
    10474
    10575    QMenu* fileMenu = menuBar()->addMenu("&File");
     
    218188{
    219189    m_addressBar->setText(url.toString());
    220     m_browser->requestActivateWindow();
     190    m_browser->setFocus();
    221191    m_browser->view()->setFocus(true);
    222192}
     
    351321    delete m_urlLoader;
    352322    delete m_addressBar;
    353 }
     323    delete m_browser;
     324}
  • trunk/Tools/MiniBrowser/qt/BrowserWindow.h

    r96108 r96126  
    3434#include "MiniBrowserApplication.h"
    3535#include <QStringList>
    36 #include <QTimer>
     36#include <QtGui>
    3737
    3838class UrlLoader;
    39 
    40 class WindowWrapper : public QWidget
    41 {
    42     Q_OBJECT
    43 
    44 public:
    45     WindowWrapper(QWindow* window, QWidget* widget = 0);
    46 
    47 protected:
    48     void showEvent(QShowEvent* event);
    49     void resizeEvent(QResizeEvent* event);
    50 
    51 private slots:
    52     void doResize();
    53 
    54 private:
    55     QWindow* m_window;
    56     QTimer m_resizeTimer;
    57 };
    5839
    5940class BrowserWindow : public QMainWindow {
  • trunk/Tools/MiniBrowser/qt/MiniBrowser.pro

    r96108 r96126  
    3333QT += network declarative
    3434macx:QT+=xml
    35 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    3635
    3736linux-* {
  • trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h

    r96108 r96126  
    3030#define MiniBrowserApplication_h
    3131
    32 #include <QApplication>
    33 #include <QFileDialog>
    3432#include <QHash>
    35 #include <QLabel>
    36 #include <QLineEdit>
    37 #include <QMainWindow>
    38 #include <QMenu>
    39 #include <QMenuBar>
    40 #include <QShortcut>
    41 #include <QStatusBar>
    4233#include <QStringList>
    43 #include <QToolBar>
    4434#include <QTouchEvent>
    45 #include <QUrl>
     35#include <QtGui>
    4636
    4737struct WindowOptions {
  • trunk/Tools/MiniBrowser/qt/main.cpp

    r96108 r96126  
    3333#include <QLatin1String>
    3434#include <QRegExp>
     35#include <QtGui>
    3536
    3637int main(int argc, char** argv)
  • trunk/Tools/QtTestBrowser/QtTestBrowser.pro

    r96108 r96126  
    2525    cookiejar.h
    2626
    27 !isEqual(QT_ARCH,sh4) {
    28     greaterThan(QT_MAJOR_VERSION, 4):isEmpty(QT.uitools.name) {
    29         message("QtUiTools library not found. QWidget plugin loading will be disabled")
    30         DEFINES += QT_NO_UITOOLS
    31     } else {
    32         CONFIG += uitools
    33     }
    34 }
     27!isEqual(QT_ARCH,sh4): CONFIG += uitools
    3528
    3629isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
     
    4336QT += network
    4437macx:QT+=xml
    45 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
    4638
    4739unix:!mac:!symbian:!embedded {
  • trunk/Tools/QtTestBrowser/launcherwindow.cpp

    r96108 r96126  
    3737#include "urlloader.h"
    3838
    39 #include <QApplication>
    40 #include <QCheckBox>
    41 #include <QComboBox>
    4239#include <QCoreApplication>
    43 #include <QDialogButtonBox>
    44 #include <QInputDialog>
    45 #include <QLabel>
    46 #ifndef QT_NO_LINEEDIT
    47 #include <QLineEdit>
    48 #endif
    49 #ifndef QT_NO_SHORTCUT
    50 #include <QMenuBar>
    51 #endif
    52 #include <QSlider>
    53 #include <QSplitter>
    54 #include <QStatusBar>
    55 #include <QToolButton>
    56 #include <QToolTip>
    57 #include <QVBoxLayout>
    5840
    5941#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
  • trunk/Tools/QtTestBrowser/launcherwindow.h

    r96108 r96126  
    3434#define launcherwindow_h
    3535
     36#include <QtGui>
    3637#include <QtNetwork/QNetworkRequest>
    3738
  • trunk/Tools/QtTestBrowser/locationedit.h

    r96108 r96126  
    3232
    3333#ifndef QT_NO_INPUTDIALOG
    34 #include <QApplication>
    35 #include <QIcon>
    36 #include <QLabel>
    37 #include <QLineEdit>
    38 #include <QStyleOptionFrameV3>
    39 #include <QTimer>
     34#include <QtGui>
    4035
    4136class LocationEdit : public QLineEdit {
  • trunk/Tools/QtTestBrowser/main.cpp

    r96108 r96126  
    3636WindowOptions windowOptions;
    3737
    38 #include <QApplication>
     38
    3939#include <QDir>
    4040#include <QFile>
    4141#include <QFileInfo>
    4242#include <QFontDatabase>
     43
    4344
    4445#if defined(Q_WS_X11)
  • trunk/Tools/QtTestBrowser/mainwindow.cpp

    r96108 r96126  
    3636#include "utils.h"
    3737
    38 #include <QAction>
    39 #ifndef QT_NO_INPUTDIALOG
    40 #include <QCompleter>
    41 #endif
    42 #ifndef QT_NO_FILEDIALOG
    43 #include <QFileDialog>
    44 #endif
    45 
    4638MainWindow::MainWindow()
    4739    : m_page(new WebPage(this))
  • trunk/Tools/QtTestBrowser/mainwindow.h

    r96108 r96126  
    3434#define mainwindow_h
    3535
     36#include <QtGui>
    3637#include "webpage.h"
    37 
    38 #include <QMainWindow>
    39 #include <QStringListModel>
    40 #include <QToolBar>
    4138
    4239class LocationEdit;
  • trunk/Tools/QtTestBrowser/webinspector.h

    r96108 r96126  
    2929#define webinspector_h
    3030
     31#include <QtGui>
    3132#include "qwebinspector.h"
    3233
  • trunk/Tools/QtTestBrowser/webpage.cpp

    r96108 r96126  
    3535#include "launcherwindow.h"
    3636
    37 #include <QAction>
    38 #include <QApplication>
    3937#include <QAuthenticator>
    40 #ifndef QT_NO_DESKTOPSERVICES
    4138#include <QDesktopServices>
    42 #endif
    43 #include <QDialogButtonBox>
    44 #include <QLabel>
    45 #include <QLayout>
    46 #ifndef QT_NO_LINEEDIT
    47 #include <QLineEdit>
    48 #endif
     39#include <QtGui>
    4940#include <QtNetwork/QNetworkReply>
    5041#include <QtNetwork/QNetworkRequest>
  • trunk/Tools/QtTestBrowser/webview.cpp

    r96108 r96126  
    3333#include "webview.h"
    3434
    35 #include <QAction>
     35#include <QtGui>
    3636#include <QGraphicsScene>
    37 #include <QGraphicsSceneContextMenuEvent>
    38 #include <QGraphicsSceneMouseEvent>
    39 #include <QMenu>
    40 #include <QScrollBar>
    41 #include <QTimer>
    42 
    43 #ifndef QT_NO_ANIMATION
    44 #include <QAbstractAnimation>
    45 #include <QAbstractTransition>
    46 #include <QFinalState>
    47 #include <QPropertyAnimation>
    48 #include <QState>
    49 #include <QStateMachine>
    50 #endif
    5137
    5238WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent)
  • trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro

    r96116 r96126  
    1010
    1111QT += declarative
    12 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    1312
    1413GENERATED_SOURCES_DIR = ../../generated
  • trunk/Tools/WebKitTestRunner/PlatformWebView.h

    r96108 r96126  
    2828
    2929#if defined(BUILDING_QT__)
    30 class QDesktopWebView;
    31 typedef QDesktopWebView* PlatformWKView;
    32 class QSGCanvas;
    33 typedef QSGCanvas* PlatformWindow;
     30namespace WTR {
     31class WebView;
     32}
     33typedef WTR::WebView* PlatformWKView;
     34class QMainWindow;
     35typedef QMainWindow* PlatformWindow;
    3436#elif defined(__APPLE__) && __APPLE__
    3537#if __OBJC__
  • trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp

    r96116 r96126  
    2929#include "PlatformWebView.h"
    3030#include "TestController.h"
    31 #include <QGraphicsSceneMouseEvent>
    3231#include <QKeyEvent>
    3332#include <QtTest/QtTest>
  • trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

    r96108 r96126  
    2929#include "PlatformWebView.h"
    3030#include "qdesktopwebview.h"
    31 
    32 #include <QApplication>
    3331#include <QtDeclarative/qsgcanvas.h>
     32#include <QtGui>
    3433
    3534namespace WTR {
    3635
     36class WebView : public QSGCanvas {
     37public:
     38    WebView(WKContextRef, WKPageGroupRef);
     39
     40    QDesktopWebView* wkView() const { return m_item; }
     41    WKPageRef pageRef() const { return m_item->pageRef(); }
     42
     43    virtual ~WebView() { delete m_item; }
     44
     45private:
     46    QDesktopWebView* m_item;
     47};
     48
     49WebView::WebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
     50    : m_item(new QDesktopWebView(contextRef, pageGroupRef, rootItem()))
     51{
     52    m_item->setWidth(800);
     53    m_item->setHeight(600);
     54}
     55
    3756PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
    38     : m_view(new QDesktopWebView(contextRef, pageGroupRef))
    39     , m_window(new QSGCanvas)
     57    : m_view(new WebView(contextRef, pageGroupRef))
     58    , m_window(new QMainWindow())
    4059{
    41     m_view->setParent(m_window->rootItem());
     60    m_view->setParent(m_window);
     61    m_window->setCentralWidget(m_view);
    4262    m_window->setGeometry(0, 0, 800, 600);
    4363
    4464    QFocusEvent ev(QEvent::WindowActivate);
    4565    QApplication::sendEvent(m_view, &ev);
    46     m_view->setFocus(Qt::OtherFocusReason);
     66    m_view->wkView()->setFocus(Qt::OtherFocusReason);
    4767}
    4868
     
    85105bool PlatformWebView::sendEvent(QEvent* event)
    86106{
    87     return QCoreApplication::sendEvent(m_view, event);
     107    return QCoreApplication::sendEvent(m_view->wkView(), event);
    88108}
    89109
    90110void PlatformWebView::postEvent(QEvent* event)
    91111{
    92     QCoreApplication::postEvent(m_view, event);
     112    QCoreApplication::postEvent(m_view->wkView(), event);
    93113}
    94114
  • trunk/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro

    r96116 r96126  
    3333
    3434QT = core gui network declarative testlib
    35 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    3635
    3736HEADERS = \
Note: See TracChangeset for help on using the changeset viewer.