Changeset 101165 in webkit

Timestamp:

Nov 25, 2011, 4:54:15 AM (15 years ago)

Author:

Simon Hausmann

Message:

[Qt] Eliminate warnings about the deprecated QQuickCanvas::sceneGraphEngine() function.

Reviewed by Andreas Kling.

We use the function in question to find out if we can connect to the scene graph's
afterRendering signal. The signal has been moved into QQuickCanvas right away, so
we can connect to it as soon as we have a canvas.

• UIProcess/API/qt/qquickwebpage.cpp:

(QQuickWebPagePrivate::initializeSceneGraphConnections):

• UIProcess/API/qt/qquickwebpage_p.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebpage.cpp (modified) (3 diffs)
• UIProcess/API/qt/qquickwebpage_p.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-25  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Eliminate warnings about the deprecated QQuickCanvas::sceneGraphEngine() function.
+
+        Reviewed by Andreas Kling.
+
+        We use the function in question to find out if we can connect to the scene graph's
+        afterRendering signal. The signal has been moved into QQuickCanvas right away, so
+        we can connect to it as soon as we have a canvas.
+
+        * UIProcess/API/qt/qquickwebpage.cpp:
+        (QQuickWebPagePrivate::initializeSceneGraphConnections):
+        * UIProcess/API/qt/qquickwebpage_p.h:
+
 2011-11-24  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp

@@ -29 +29 @@
 #include <QtCore/QUrl>
 #include <QtDeclarative/QQuickCanvas>
-#include <QtDeclarative/QSGEngine>
 
 QQuickWebPage::QQuickWebPage(QQuickItem* parent)
@@ -182 +181 @@
         return;
     paintingIsInitialized = true;
-    if (q->sceneGraphEngine())
-        _q_onSceneGraphInitialized();
-    else
-        QObject::connect(q->canvas(), SIGNAL(sceneGraphInitialized()), q, SLOT(_q_onSceneGraphInitialized()));
+    QObject::connect(q->canvas(), SIGNAL(afterRendering()), q, SLOT(_q_onAfterSceneRender()), Qt::DirectConnection);
 }
 
@@ -244 +240 @@
 }
 
-void QQuickWebPagePrivate::_q_onSceneGraphInitialized()
-{
-    QSGEngine* engine = q->sceneGraphEngine();
-    QObject::connect(engine, SIGNAL(afterRendering()), q, SLOT(_q_onAfterSceneRender()), Qt::DirectConnection);
-}
-
 #include "moc_qquickwebpage_p.cpp"

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h

@@ -70 +70 @@
 private:
     Q_PRIVATE_SLOT(d, void _q_onAfterSceneRender());
-    Q_PRIVATE_SLOT(d, void _q_onSceneGraphInitialized());
 
     QQuickWebPagePrivate* d;