Changeset 96126 in webkit
- Timestamp:
- Sep 27, 2011 10:27:12 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 55 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r96108 r96126 1 2011-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 1 14 2011-09-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 15 -
trunk/Source/WebCore/ChangeLog
r96123 r96126 1 2011-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 1 15 2011-09-27 Csaba Osztrogonác <ossy@webkit.org> 2 16 -
trunk/Source/WebCore/WebCore.pri
r96108 r96126 333 333 linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF 334 334 335 unix|win32-g++* { 336 QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork 337 greaterThan(QT_MAJOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtWidgets 338 } 335 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork 339 336 unix:!mac:!symbian:CONFIG += link_pkgconfig 340 337 -
trunk/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
r96108 r96126 30 30 #include "TranslateTransformOperation.h" 31 31 #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>38 32 #include <QtCore/qabstractanimation.h> 39 33 #include <QtCore/qdatetime.h> … … 43 37 #include <QtCore/qtimer.h> 44 38 #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> 45 44 #include <QtGui/qpainter.h> 46 45 #include <QtGui/qpixmap.h> 47 46 #include <QtGui/qpixmapcache.h> 47 #include <QtGui/qstyleoption.h> 48 48 49 49 #if ENABLE(TILED_BACKING_STORE) -
trunk/Source/WebKit.pro
r96108 r96126 16 16 } 17 17 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 }25 18 } 26 19 -
trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp
r96108 r96126 35 35 #include "IntRect.h" 36 36 #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>44 37 #include <QtCore/qmetaobject.h> 45 38 #include <QtCore/qsharedpointer.h> 46 39 #include <QtCore/qtimer.h> 40 #include <QtGui/qapplication.h> 41 #include <QtGui/qgraphicsscene.h> 42 #include <QtGui/qgraphicssceneevent.h> 43 #include <QtGui/qgraphicsview.h> 47 44 #include <QtGui/qpixmapcache.h> 48 45 #include <QtGui/qscrollbar.h> 46 #include <QtGui/qstyleoption.h> 47 #include <QtGui/qinputcontext.h> 49 48 #if defined(Q_WS_X11) 50 49 #include <QX11Info> -
trunk/Source/WebKit/qt/Api/qgraphicswebview.h
r96108 r96126 24 24 #include "qwebpage.h" 25 25 #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> 30 27 #include <QtGui/qgraphicswidget.h> 31 28 #include <QtGui/qicon.h> 32 #endif33 #include <QtGui/qevent.h>34 29 #include <QtGui/qpainter.h> 35 30 #include <QtNetwork/qnetworkaccessmanager.h> -
trunk/Source/WebKit/qt/Api/qwebframe.h
r96108 r96126 25 25 #include <QtCore/qurl.h> 26 26 #include <QtCore/qvariant.h> 27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)28 #include <QtWidgets/qicon.h>29 #else30 27 #include <QtGui/qicon.h> 31 #endif32 28 #include <QtScript/qscriptengine.h> 33 29 #include <QtNetwork/qnetworkaccessmanager.h> -
trunk/Source/WebKit/qt/Api/qwebhistory.h
r96108 r96126 23 23 #include <QtCore/qurl.h> 24 24 #include <QtCore/qstring.h> 25 #include <QtGui/qicon.h> 25 26 #include <QtCore/qdatetime.h> 26 27 #include <QtCore/qshareddata.h> 27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)28 #include <QtWidgets/qicon.h>29 #else30 #include <QtGui/qicon.h>31 #endif32 28 33 29 #include "qwebkitglobal.h" -
trunk/Source/WebKit/qt/Api/qwebpage.h
r96108 r96126 27 27 #include <QtCore/qobject.h> 28 28 #include <QtCore/qurl.h> 29 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)30 #include <QtWidgets/qwidget.h>31 #else32 29 #include <QtGui/qwidget.h> 33 #endif34 30 35 31 QT_BEGIN_NAMESPACE -
trunk/Source/WebKit/qt/Api/qwebsettings.h
r96108 r96126 25 25 #include <QtCore/qstring.h> 26 26 #include <QtGui/qpixmap.h> 27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)28 #include <QtWidgets/qicon.h>29 #else30 27 #include <QtGui/qicon.h> 31 #endif32 28 #include <QtCore/qshareddata.h> 33 29 -
trunk/Source/WebKit/qt/Api/qwebview.h
r96108 r96126 24 24 #include "qwebkitglobal.h" 25 25 #include "qwebpage.h" 26 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)27 #include <QtWidgets/qwidget.h>28 #include <QtWidgets/qicon.h>29 #else30 26 #include <QtGui/qwidget.h> 31 27 #include <QtGui/qicon.h> 32 #endif33 28 #include <QtGui/qpainter.h> 34 29 #include <QtCore/qurl.h> -
trunk/Source/WebKit/qt/ChangeLog
r96116 r96126 1 2011-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 1 30 2011-09-27 Csaba Osztrogonác <ossy@webkit.org> 2 31 -
trunk/Source/WebKit/qt/QtWebKit.pro
r96108 r96126 42 42 # It used to be in WebCore.pro but now that this is the main pro file it has to be here. 43 43 QT += network 44 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport45 44 46 45 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. -
trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h
r96108 r96126 32 32 #include "qwebpage.h" 33 33 #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>40 34 #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> 41 41 42 42 #include <Settings.h> -
trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.cpp
r96108 r96126 25 25 #ifndef QT_NO_COMBOBOX 26 26 27 #include <Q AbstractItemView>28 #include <Q Application>27 #include <QtGui/QAbstractItemView> 28 #include <QtGui/QApplication> 29 29 #include <QtGui/QMouseEvent> 30 30 -
trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.h
r96108 r96126 24 24 #include "Platform.h" 25 25 26 #include <Q ComboBox>26 #include <QtGui/QComboBox> 27 27 28 28 #ifndef QT_NO_COMBOBOX -
trunk/Source/WebKit/qt/declarative/declarative.pro
r96113 r96126 41 41 42 42 QT += declarative 43 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets44 43 45 44 contains(QT_CONFIG, qtquick1): { -
trunk/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
r96108 r96126 21 21 #include "qdeclarativewebview_p.h" 22 22 23 #include <QApplication>24 #include <QGraphicsSceneMouseEvent>25 23 #include <QtCore/QDebug> 26 24 #include <QtCore/QEvent> … … 29 27 #include <QtDeclarative/QDeclarativeEngine> 30 28 #include <QtDeclarative/qdeclarative.h> 29 #include <QtGui/QApplication> 30 #include <QtGui/QGraphicsSceneMouseEvent> 31 31 #include <QtGui/QKeyEvent> 32 32 #include <QtGui/QMouseEvent> -
trunk/Source/WebKit/qt/declarative/qdeclarativewebview_p.h
r96108 r96126 27 27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) 28 28 #include <QtQuick1/QDeclarativeItem> 29 #include <QtWidgets/QAction>30 29 #else 31 30 #include <QtDeclarative/QDeclarativeItem> 31 #endif 32 32 33 #include <QtGui/QAction> 33 #endif34 35 34 #include <QtNetwork/QNetworkAccessManager> 36 35 #include "qgraphicswebview.h" -
trunk/Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
r96108 r96126 18 18 */ 19 19 20 #include <Q Application>21 #include <Q Painter>20 #include <QtGui> 21 #include <QWebPage> 22 22 #include <QWebFrame> 23 #include <QWebPage>24 23 25 24 //! [0] -
trunk/Source/WebKit/qt/examples/platformplugin/WebNotificationPresenter.h
r96108 r96126 23 23 24 24 #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> 32 26 33 27 class WebNotificationWidget : public QWidget -
trunk/Source/WebKit/qt/tests/tests.pri
r96116 r96126 22 22 include(../../../WebKit.pri) 23 23 QT += testlib network 24 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets25 24 26 25 lessThan(QT_MAJOR_VERSION, 5) { -
trunk/Source/WebKit2/ChangeLog
r96121 r96126 1 2011-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 1 25 2011-09-27 Carlos Garcia Campos <cgarcia@igalia.com> 2 26 -
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp
r96108 r96126 24 24 #include "qweberror.h" 25 25 26 #include <QFileDialog>27 #include <QGraphicsSceneEvent>28 26 #include <QGraphicsSceneResizeEvent> 29 27 #include <QStyleOptionGraphicsItem> … … 34 32 #include <QtDeclarative/qsgview.h> 35 33 #include <QtGui/QCursor> 36 #include <QtGui/Q Drag>34 #include <QtGui/QFileDialog> 37 35 #include <QtGui/QFocusEvent> 36 #include <QtGui/QGraphicsSceneEvent> 38 37 #include <QtGui/QHoverEvent> 39 38 #include <QtGui/QInputMethodEvent> … … 83 82 void QDesktopWebViewPrivate::startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction) 84 83 { 85 QWi ndow* window= q->canvas();86 if (!wi ndow)84 QWidget* widget = q->canvas(); 85 if (!widget) 87 86 return; 88 87 89 QDrag* drag = new QDrag(wi ndow);88 QDrag* drag = new QDrag(widget); 90 89 drag->setPixmap(QPixmap::fromImage(dragImage)); 91 90 drag->setMimeData(data); 92 91 *dropAction = drag->exec(supportedDropActions); 93 92 *globalPosition = QCursor::pos(); 94 *clientPosition = wi ndow->mapFromGlobal(*globalPosition);93 *clientPosition = widget->mapFromGlobal(*globalPosition); 95 94 } 96 95 … … 118 117 { 119 118 // FIXME: Add a proper implementation when Qt 5 supports tooltip. 119 q->canvas()->setToolTip(newToolTip); 120 120 } 121 121 … … 128 128 { 129 129 // FIXME: add proper cursor handling when Qt 5 supports it. 130 q->canvas()->setCursor(newCursor); 130 131 } 131 132 … … 164 165 return; 165 166 166 QWi ndow* window= q->canvas();167 if (!wi ndow)167 QWidget* widget = q->canvas(); 168 if (!widget) 168 169 return; 169 170 170 171 activeMenu = menu; 171 172 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()); 176 174 QPoint menuPositionInScene = q->mapToScene(menu->pos()).toPoint(); 177 menu->exec(wi ndow->mapToGlobal(menuPositionInScene));175 menu->exec(widget->mapToGlobal(menuPositionInScene)); 178 176 // The last function to get out of exec() clear the local copy. 179 177 if (activeMenu == menu) … … 406 404 selectedFileName = selectedFileNames.at(0); 407 405 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); 419 408 fileDialog->open(this, SLOT(onOpenPanelFilesSelected())); 420 409 -
trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
r96108 r96126 45 45 46 46 namespace WTR { 47 class PlatformWebView;47 class WebView; 48 48 } 49 49 … … 121 121 void init(); 122 122 123 friend class WTR:: PlatformWebView;123 friend class WTR::WebView; 124 124 friend class QDesktopWebViewPrivate; 125 125 QDesktopWebViewPrivate *d; -
trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
r96111 r96126 12 12 13 13 include(../../../../../WebKit.pri) 14 QT += testlib declarative widgets14 QT += testlib declarative 15 15 16 16 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR -
trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pro
r96108 r96126 1 1 TEMPLATE = subdirs 2 SUBDIRS = qtouchwebview qdesktopwebview commonviewtests 3 lessThan(QT_MAJOR_VERSION, 5): SUBDIRS += qmltests 2 SUBDIRS = qtouchwebview qdesktopwebview commonviewtests qmltests -
trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h
r96108 r96126 24 24 #include <QtCore/QSharedPointer> 25 25 #include <QtCore/QSize> 26 #include <Q Menu>26 #include <QtGui/QMenu> 27 27 #include <WebKit2/WKBase.h> 28 28 -
trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp
r96108 r96126 31 31 #include <QtDeclarative/QSGCanvas> 32 32 #include <QtDeclarative/QSGItem> 33 #include <Q StandardItemModel>33 #include <QtGui/QStandardItemModel> 34 34 35 35 using namespace WebCore; … … 45 45 { 46 46 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()); 52 48 connect(comboBox, SIGNAL(activated(int)), SLOT(setSelectedIndex(int))); 53 49 connect(comboBox, SIGNAL(didHide()), SLOT(onPopupMenuHidden()), Qt::QueuedConnection); -
trunk/Tools/ChangeLog
r96121 r96126 1 2011-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 1 48 2011-09-27 Carlos Garcia Campos <cgarcia@igalia.com> 2 49 -
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
r96108 r96126 1 1 TARGET = DumpRenderTree 2 2 CONFIG -= 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 11 4 12 5 BASEDIR = $$PWD/../ … … 28 21 QT = core gui network testlib 29 22 macx: QT += xml 30 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport31 23 32 24 HEADERS = $$BASEDIR/WorkQueue.h \ -
trunk/Tools/DumpRenderTree/qt/ImageDiff.pro
r96108 r96126 8 8 9 9 QT = core gui 10 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets11 10 12 11 SOURCES = ImageDiff.cpp -
trunk/Tools/MiniBrowser/qt/BrowserView.cpp
r96108 r96126 37 37 #include <qwebnavigationcontroller.h> 38 38 39 BrowserView::BrowserView(bool useTouchWebView, QWi ndow* parent)39 BrowserView::BrowserView(bool useTouchWebView, QWidget* parent) 40 40 : QSGCanvas(parent) 41 41 , m_item(0) -
trunk/Tools/MiniBrowser/qt/BrowserView.h
r96108 r96126 30 30 #define BrowserView_h 31 31 32 #include <QAction>33 32 #include <QtDeclarative/qsgcanvas.h> 34 33 #include <qwebkittypes.h> … … 42 41 43 42 public: 44 BrowserView(bool useTouchWebView, QWi ndow* parent = 0);43 BrowserView(bool useTouchWebView, QWidget* parent = 0); 45 44 virtual ~BrowserView(); 46 45 -
trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp
r96108 r96126 43 43 #endif 44 44 45 WindowWrapper::WindowWrapper(QWindow* window, QWidget* widget)46 : QWidget(widget)47 , m_window(window)48 {49 // Throttle resize events a bit50 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 75 45 BrowserWindow::BrowserWindow(WindowOptions* options) 76 46 : m_urlLoader(0) … … 100 70 } 101 71 102 setCentralWidget(new WindowWrapper(m_browser, this));103 centralWidget()->setFocus(Qt::OtherFocusReason);72 this->setCentralWidget(m_browser); 73 m_browser->setFocus(Qt::OtherFocusReason); 104 74 105 75 QMenu* fileMenu = menuBar()->addMenu("&File"); … … 218 188 { 219 189 m_addressBar->setText(url.toString()); 220 m_browser-> requestActivateWindow();190 m_browser->setFocus(); 221 191 m_browser->view()->setFocus(true); 222 192 } … … 351 321 delete m_urlLoader; 352 322 delete m_addressBar; 353 } 323 delete m_browser; 324 } -
trunk/Tools/MiniBrowser/qt/BrowserWindow.h
r96108 r96126 34 34 #include "MiniBrowserApplication.h" 35 35 #include <QStringList> 36 #include <Q Timer>36 #include <QtGui> 37 37 38 38 class UrlLoader; 39 40 class WindowWrapper : public QWidget41 {42 Q_OBJECT43 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 };58 39 59 40 class BrowserWindow : public QMainWindow { -
trunk/Tools/MiniBrowser/qt/MiniBrowser.pro
r96108 r96126 33 33 QT += network declarative 34 34 macx:QT+=xml 35 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets36 35 37 36 linux-* { -
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h
r96108 r96126 30 30 #define MiniBrowserApplication_h 31 31 32 #include <QApplication>33 #include <QFileDialog>34 32 #include <QHash> 35 #include <QLabel>36 #include <QLineEdit>37 #include <QMainWindow>38 #include <QMenu>39 #include <QMenuBar>40 #include <QShortcut>41 #include <QStatusBar>42 33 #include <QStringList> 43 #include <QToolBar>44 34 #include <QTouchEvent> 45 #include <Q Url>35 #include <QtGui> 46 36 47 37 struct WindowOptions { -
trunk/Tools/MiniBrowser/qt/main.cpp
r96108 r96126 33 33 #include <QLatin1String> 34 34 #include <QRegExp> 35 #include <QtGui> 35 36 36 37 int main(int argc, char** argv) -
trunk/Tools/QtTestBrowser/QtTestBrowser.pro
r96108 r96126 25 25 cookiejar.h 26 26 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 35 28 36 29 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. … … 43 36 QT += network 44 37 macx:QT+=xml 45 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport46 38 47 39 unix:!mac:!symbian:!embedded { -
trunk/Tools/QtTestBrowser/launcherwindow.cpp
r96108 r96126 37 37 #include "urlloader.h" 38 38 39 #include <QApplication>40 #include <QCheckBox>41 #include <QComboBox>42 39 #include <QCoreApplication> 43 #include <QDialogButtonBox>44 #include <QInputDialog>45 #include <QLabel>46 #ifndef QT_NO_LINEEDIT47 #include <QLineEdit>48 #endif49 #ifndef QT_NO_SHORTCUT50 #include <QMenuBar>51 #endif52 #include <QSlider>53 #include <QSplitter>54 #include <QStatusBar>55 #include <QToolButton>56 #include <QToolTip>57 #include <QVBoxLayout>58 40 59 41 #if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX) -
trunk/Tools/QtTestBrowser/launcherwindow.h
r96108 r96126 34 34 #define launcherwindow_h 35 35 36 #include <QtGui> 36 37 #include <QtNetwork/QNetworkRequest> 37 38 -
trunk/Tools/QtTestBrowser/locationedit.h
r96108 r96126 32 32 33 33 #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> 40 35 41 36 class LocationEdit : public QLineEdit { -
trunk/Tools/QtTestBrowser/main.cpp
r96108 r96126 36 36 WindowOptions windowOptions; 37 37 38 #include <QApplication> 38 39 39 #include <QDir> 40 40 #include <QFile> 41 41 #include <QFileInfo> 42 42 #include <QFontDatabase> 43 43 44 44 45 #if defined(Q_WS_X11) -
trunk/Tools/QtTestBrowser/mainwindow.cpp
r96108 r96126 36 36 #include "utils.h" 37 37 38 #include <QAction>39 #ifndef QT_NO_INPUTDIALOG40 #include <QCompleter>41 #endif42 #ifndef QT_NO_FILEDIALOG43 #include <QFileDialog>44 #endif45 46 38 MainWindow::MainWindow() 47 39 : m_page(new WebPage(this)) -
trunk/Tools/QtTestBrowser/mainwindow.h
r96108 r96126 34 34 #define mainwindow_h 35 35 36 #include <QtGui> 36 37 #include "webpage.h" 37 38 #include <QMainWindow>39 #include <QStringListModel>40 #include <QToolBar>41 38 42 39 class LocationEdit; -
trunk/Tools/QtTestBrowser/webinspector.h
r96108 r96126 29 29 #define webinspector_h 30 30 31 #include <QtGui> 31 32 #include "qwebinspector.h" 32 33 -
trunk/Tools/QtTestBrowser/webpage.cpp
r96108 r96126 35 35 #include "launcherwindow.h" 36 36 37 #include <QAction>38 #include <QApplication>39 37 #include <QAuthenticator> 40 #ifndef QT_NO_DESKTOPSERVICES41 38 #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> 49 40 #include <QtNetwork/QNetworkReply> 50 41 #include <QtNetwork/QNetworkRequest> -
trunk/Tools/QtTestBrowser/webview.cpp
r96108 r96126 33 33 #include "webview.h" 34 34 35 #include <Q Action>35 #include <QtGui> 36 36 #include <QGraphicsScene> 37 #include <QGraphicsSceneContextMenuEvent>38 #include <QGraphicsSceneMouseEvent>39 #include <QMenu>40 #include <QScrollBar>41 #include <QTimer>42 43 #ifndef QT_NO_ANIMATION44 #include <QAbstractAnimation>45 #include <QAbstractTransition>46 #include <QFinalState>47 #include <QPropertyAnimation>48 #include <QState>49 #include <QStateMachine>50 #endif51 37 52 38 WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent) -
trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
r96116 r96126 10 10 11 11 QT += declarative 12 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets13 12 14 13 GENERATED_SOURCES_DIR = ../../generated -
trunk/Tools/WebKitTestRunner/PlatformWebView.h
r96108 r96126 28 28 29 29 #if defined(BUILDING_QT__) 30 class QDesktopWebView; 31 typedef QDesktopWebView* PlatformWKView; 32 class QSGCanvas; 33 typedef QSGCanvas* PlatformWindow; 30 namespace WTR { 31 class WebView; 32 } 33 typedef WTR::WebView* PlatformWKView; 34 class QMainWindow; 35 typedef QMainWindow* PlatformWindow; 34 36 #elif defined(__APPLE__) && __APPLE__ 35 37 #if __OBJC__ -
trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp
r96116 r96126 29 29 #include "PlatformWebView.h" 30 30 #include "TestController.h" 31 #include <QGraphicsSceneMouseEvent>32 31 #include <QKeyEvent> 33 32 #include <QtTest/QtTest> -
trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
r96108 r96126 29 29 #include "PlatformWebView.h" 30 30 #include "qdesktopwebview.h" 31 32 #include <QApplication>33 31 #include <QtDeclarative/qsgcanvas.h> 32 #include <QtGui> 34 33 35 34 namespace WTR { 36 35 36 class WebView : public QSGCanvas { 37 public: 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 45 private: 46 QDesktopWebView* m_item; 47 }; 48 49 WebView::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 37 56 PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef) 38 : m_view(new QDesktopWebView(contextRef, pageGroupRef))39 , m_window(new Q SGCanvas)57 : m_view(new WebView(contextRef, pageGroupRef)) 58 , m_window(new QMainWindow()) 40 59 { 41 m_view->setParent(m_window->rootItem()); 60 m_view->setParent(m_window); 61 m_window->setCentralWidget(m_view); 42 62 m_window->setGeometry(0, 0, 800, 600); 43 63 44 64 QFocusEvent ev(QEvent::WindowActivate); 45 65 QApplication::sendEvent(m_view, &ev); 46 m_view-> setFocus(Qt::OtherFocusReason);66 m_view->wkView()->setFocus(Qt::OtherFocusReason); 47 67 } 48 68 … … 85 105 bool PlatformWebView::sendEvent(QEvent* event) 86 106 { 87 return QCoreApplication::sendEvent(m_view , event);107 return QCoreApplication::sendEvent(m_view->wkView(), event); 88 108 } 89 109 90 110 void PlatformWebView::postEvent(QEvent* event) 91 111 { 92 QCoreApplication::postEvent(m_view , event);112 QCoreApplication::postEvent(m_view->wkView(), event); 93 113 } 94 114 -
trunk/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
r96116 r96126 33 33 34 34 QT = core gui network declarative testlib 35 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets36 35 37 36 HEADERS = \
Note: See TracChangeset
for help on using the changeset viewer.