Diff
Modified: trunk/Source/WebKit2/ChangeLog (123475 => 123476)
--- trunk/Source/WebKit2/ChangeLog 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-24 14:47:33 UTC (rev 123476)
@@ -1,3 +1,27 @@
+2012-07-24 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Fix compilation after QtQuick API changes
+ https://bugs.webkit.org/show_bug.cgi?id=91822
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ QQuickCanvas is now QQuickWindow, QQuickItem::canvas() is window() and rootItem()
+ is contentItem(). Also QQuickWindow::grabFrameBuffer() is now grabWindow().
+
+ * UIProcess/API/qt/qquickwebpage.cpp:
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewPrivate::updateIcon):
+ * UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+ (tst_QQuickWebView::multipleWebViews):
+ (tst_QQuickWebView::basicRenderingSanity):
+ (tst_QQuickWebView::transparentWebViews):
+ * UIProcess/API/qt/tests/testwindow.h:
+ (TestWindow::TestWindow):
+ * UIProcess/qt/QtPageClient.cpp:
+ (WebKit::QtPageClient::isViewVisible):
+ * UIProcess/qt/QtWebPageEventHandler.cpp:
+ (WebKit::QtWebPageEventHandler::startDrag):
+
2012-07-24 Balazs Kelemen <kbal...@webkit.org>
[Qt] Add quirks for running the web process in a profiler shell, like valgrind
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp (123475 => 123476)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2012-07-24 14:47:33 UTC (rev 123476)
@@ -30,7 +30,6 @@
#include "qquickwebpage_p_p.h"
#include "qquickwebview_p.h"
#include "qwebkittest_p.h"
-#include <QtQuick/QQuickCanvas>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (123475 => 123476)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-07-24 14:47:33 UTC (rev 123476)
@@ -491,7 +491,7 @@
{
Q_Q(QQuickWebView);
- QQuickView* view = qobject_cast<QQuickView*>(q->canvas());
+ QQuickView* view = qobject_cast<QQuickView*>(q->window());
if (!view)
return;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (123475 => 123476)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2012-07-24 14:47:33 UTC (rev 123476)
@@ -314,9 +314,9 @@
// This should not crash.
QScopedPointer<QQuickWebView> webView1(newWebView());
- webView1->setParentItem(m_window->rootItem());
+ webView1->setParentItem(m_window->contentItem());
QScopedPointer<QQuickWebView> webView2(newWebView());
- webView2->setParentItem(m_window->rootItem());
+ webView2->setParentItem(m_window->contentItem());
webView1->setSize(QSizeF(300, 400));
webView1->setUrl(QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/scroll.html")));
@@ -344,7 +344,7 @@
// This should not crash.
webView()->setVisible(true);
QTest::qWait(200);
- QImage grabbedWindow = m_window->grabFrameBuffer();
+ QImage grabbedWindow = m_window->grabWindow();
QRgb testColor = qRgba(0, 0xff, 0, 0xff);
QVERIFY(grabbedWindow.pixel(10, 10) == testColor);
QVERIFY(grabbedWindow.pixel(100, 10) == testColor);
@@ -376,9 +376,9 @@
// This should not crash.
QScopedPointer<QQuickWebView> webView1(newWebView());
- webView1->setParentItem(m_window->rootItem());
+ webView1->setParentItem(m_window->contentItem());
QScopedPointer<QQuickWebView> webView2(newWebView());
- webView2->setParentItem(m_window->rootItem());
+ webView2->setParentItem(m_window->contentItem());
QVERIFY(!webView1->experimental()->transparentBackground());
webView2->experimental()->setTransparentBackground(true);
QVERIFY(webView2->experimental()->transparentBackground());
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h (123475 => 123476)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h 2012-07-24 14:47:33 UTC (rev 123476)
@@ -43,7 +43,7 @@
: webView(webView)
{
Q_ASSERT(webView);
- webView->setParentItem(rootItem());
+ webView->setParentItem(contentItem());
}
inline void TestWindow::resizeEvent(QResizeEvent* event)
Modified: trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp (123475 => 123476)
--- trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp 2012-07-24 14:47:33 UTC (rev 123476)
@@ -35,7 +35,7 @@
#include "qquickwebview_p.h"
#include "qquickwebview_p_p.h"
#include <QGuiApplication>
-#include <QQuickCanvas>
+#include <QQuickWindow>
#include <WebCore/Cursor.h>
#include <WebCore/DragData.h>
#include <WebCore/FloatRect.h>
@@ -287,7 +287,7 @@
return false;
// FIXME: this is a workaround while QWindow::isExposed() is not ready.
- if (m_webView->canvas() && m_webView->canvas()->windowState() == Qt::WindowMinimized)
+ if (m_webView->window() && m_webView->window()->windowState() == Qt::WindowMinimized)
return false;
return m_webView->isVisible() && m_webView->page()->isVisible();
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (123475 => 123476)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-07-24 14:40:48 UTC (rev 123475)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-07-24 14:47:33 UTC (rev 123476)
@@ -33,7 +33,7 @@
#include <QGuiApplication>
#include <QInputMethod>
#include <QMimeData>
-#include <QtQuick/QQuickCanvas>
+#include <QQuickWindow>
#include <QStyleHints>
#include <QTextFormat>
#include <QTouchEvent>
@@ -562,7 +562,7 @@
QPoint globalPosition;
Qt::DropAction actualDropAction = Qt::IgnoreAction;
- if (QWindow* window = m_webPage->canvas()) {
+ if (QWindow* window = m_webPage->window()) {
QDrag* drag = new QDrag(window);
drag->setPixmap(QPixmap::fromImage(dragQImage));
drag->setMimeData(mimeData);
