Diff
Modified: trunk/Source/WebKit2/ChangeLog (102444 => 102445)
--- trunk/Source/WebKit2/ChangeLog 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-09 09:11:26 UTC (rev 102445)
@@ -1,3 +1,26 @@
+2011-12-09 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Fix compilation with newly separated Qt 5 QtQuick module
+ https://bugs.webkit.org/show_bug.cgi?id=73990
+
+ Reviewed by Kenneth Rohde Christiansen, tweaked by Csaba Osztrogonác.
+
+ Fix QtQuick includes after move from QtDeclarative to QtQuick.
+
+ * UIProcess/API/qt/qquickwebpage.cpp:
+ * UIProcess/API/qt/qquickwebpage_p.h:
+ * UIProcess/API/qt/qquickwebview.cpp:
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/tests/tests.pri: Tests need symbols from QtQuick, so link library.
+ * UIProcess/API/qt/tests/testwindow.h:
+ * UIProcess/qt/QtDialogRunner.cpp:
+ * UIProcess/qt/QtSGTileNode.cpp:
+ * UIProcess/qt/QtSGTileNode.h:
+ * UIProcess/qt/QtSGUpdateQueue.cpp:
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ * UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:
+
2011-12-09 Nayan Kumar K <naya...@motorola.com>
[WebKit2][gtk] Re-enable running TestWebKitSettings
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -26,10 +26,10 @@
#include "TransformationMatrix.h"
#include "qquickwebpage_p_p.h"
#include "qquickwebview_p.h"
-#include <QtCore/QUrl>
-#include <QtDeclarative/QSGGeometryNode>
-#include <QtDeclarative/QQuickCanvas>
-#include <QtDeclarative/QSGMaterial>
+#include <QUrl>
+#include <QtQuick/QQuickCanvas>
+#include <QtQuick/QSGGeometryNode>
+#include <QtQuick/QSGMaterial>
QQuickWebPage::QQuickWebPage(QQuickItem* parent)
: QQuickItem(parent)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h 2011-12-09 09:11:26 UTC (rev 102445)
@@ -24,7 +24,7 @@
#include "qwebkitglobal.h"
#include <QtCore/QSharedPointer>
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickItem>
class QQuickWebView;
class QQuickWebPagePrivate;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -32,9 +32,9 @@
#include "qwebpreferences_p_p.h"
#include <_javascript_Core/InitializeThreading.h>
-#include <QtDeclarative/QQuickCanvas>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QInputDialog>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QtQuick/QQuickCanvas>
#include <WKOpenPanelResultListener.h>
QQuickWebViewPrivate::QQuickWebViewPrivate(QQuickWebView* viewport, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-09 09:11:26 UTC (rev 102445)
@@ -22,7 +22,7 @@
#define qquickwebview_p_h
#include "qwebkitglobal.h"
-#include <QtDeclarative/qquickitem.h>
+#include <QtQuick/qquickitem.h>
class QDeclarativeComponent;
class QQuickWebPage;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h 2011-12-09 09:11:26 UTC (rev 102445)
@@ -22,8 +22,8 @@
#include <QResizeEvent>
#include <QScopedPointer>
-#include <QtDeclarative/qquickitem.h>
-#include <QtDeclarative/qquickview.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
// TestWindow: Utility class to ignore QQuickView details.
class TestWindow : public QQuickView {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -24,7 +24,7 @@
#include <QtDeclarative/QDeclarativeComponent>
#include <QtDeclarative/QDeclarativeContext>
#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickItem>
#include <wtf/PassOwnPtr.h>
QtDialogRunner::QtDialogRunner()
Modified: trunk/Source/WebKit2/UIProcess/qt/QtSGTileNode.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/QtSGTileNode.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/QtSGTileNode.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -21,9 +21,9 @@
#include "config.h"
#include "QtSGTileNode.h"
-#include <QSGEngine>
-#include <QSGFlatColorMaterial>
-#include <QSGTexture>
+#include <QtQuick/QSGEngine>
+#include <QtQuick/QSGFlatColorMaterial>
+#include <QtQuick/QSGTexture>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtSGTileNode.h (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/QtSGTileNode.h 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/QtSGTileNode.h 2011-12-09 09:11:26 UTC (rev 102445)
@@ -21,9 +21,9 @@
#ifndef QtSGTileNode_h
#define QtSGTileNode_h
-#include <QSGGeometryNode>
-#include <QSGOpaqueTextureMaterial>
-#include <QSGTextureMaterial>
+#include <QtQuick/QSGGeometryNode>
+#include <QtQuick/QSGOpaqueTextureMaterial>
+#include <QtQuick/QSGTextureMaterial>
QT_BEGIN_NAMESPACE
class QSGEngine;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtSGUpdateQueue.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/QtSGUpdateQueue.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/QtSGUpdateQueue.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -23,7 +23,7 @@
#include "PassOwnPtr.h"
#include "QtSGTileNode.h"
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -28,7 +28,7 @@
#include <QScrollPrepareEvent>
#include <QScrollerProperties>
#include <QWheelEvent>
-#include <QtDeclarative/qquickitem.h>
+#include <QtQuick/qquickitem.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -22,7 +22,7 @@
#include "QtWebPageProxy.h"
#include <qdeclarativeengine.h>
-#include <qquickcanvas.h>
+#include <QtQuick/qquickcanvas.h>
#include "qquickwebview_p.h"
#include "qquickwebview_p_p.h"
#include "qquickwebpage_p.h"
Modified: trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp (102444 => 102445)
--- trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -29,8 +29,8 @@
#include "PlatformPopupMenuData.h"
#include <QAbstractItemView>
#include <QCoreApplication>
-#include <QtDeclarative/QQuickCanvas>
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickCanvas>
+#include <QtQuick/QQuickItem>
#include <QMouseEvent>
#include <QStandardItemModel>
#include "WebPopupItem.h"
Modified: trunk/Tools/ChangeLog (102444 => 102445)
--- trunk/Tools/ChangeLog 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Tools/ChangeLog 2011-12-09 09:11:26 UTC (rev 102445)
@@ -1,3 +1,15 @@
+2011-12-09 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Fix compilation with newly separated Qt 5 QtQuick module
+ https://bugs.webkit.org/show_bug.cgi?id=73990
+
+ Reviewed by Kenneth Rohde Christiansen, tweaked by Csaba Osztrogonác.
+
+ Fix QtQuick includes after move from QtDeclarative to QtQuick.
+
+ * MiniBrowser/qt/BrowserWindow.h:
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+
2011-12-08 Adam Klein <ad...@chromium.org>
[MutationObservers] V8LazyEventHandler breaks microtask delivery semantics
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.h (102444 => 102445)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2011-12-09 09:11:26 UTC (rev 102445)
@@ -31,7 +31,7 @@
#include "MiniBrowserApplication.h"
#include <QStringList>
-#include <QtDeclarative/QQuickView>
+#include <QtQuick/QQuickView>
class QQuickWebView;
Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (102444 => 102445)
--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2011-12-09 09:02:23 UTC (rev 102444)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2011-12-09 09:11:26 UTC (rev 102445)
@@ -32,7 +32,7 @@
#include <QApplication>
#include <QDeclarativeProperty>
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include <qwindowsysteminterface_qpa.h>
namespace WTR {
