Title: [98722] trunk/Source/WebKit2
- Revision
- 98722
- Author
- [email protected]
- Date
- 2011-10-28 06:06:52 -0700 (Fri, 28 Oct 2011)
Log Message
[Qt] Adapt to QSG* to QQuick* API change in qtdeclarative
https://bugs.webkit.org/show_bug.cgi?id=70494
One more buildfix. (unreviewed)
* UIProcess/API/qt/qtouchwebpage.cpp:
(computeEffectiveOpacity):
(QTouchWebPage::itemChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98721 => 98722)
--- trunk/Source/WebKit2/ChangeLog 2011-10-28 13:06:34 UTC (rev 98721)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-28 13:06:52 UTC (rev 98722)
@@ -1,3 +1,14 @@
+2011-10-28 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Adapt to QSG* to QQuick* API change in qtdeclarative
+ https://bugs.webkit.org/show_bug.cgi?id=70494
+
+ One more buildfix. (unreviewed)
+
+ * UIProcess/API/qt/qtouchwebpage.cpp:
+ (computeEffectiveOpacity):
+ (QTouchWebPage::itemChange):
+
2011-10-28 Simon Hausmann <[email protected]>
[Qt] Adapt to QSG* to QQuick* API change in qtdeclarative
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp (98721 => 98722)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-10-28 13:06:34 UTC (rev 98721)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-10-28 13:06:52 UTC (rev 98722)
@@ -27,7 +27,7 @@
#include <QApplication>
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
-#include <QSGCanvas>
+#include <QQuickCanvas>
#include <QSGEngine>
#include <QUrl>
@@ -156,7 +156,7 @@
}
-static float computeEffectiveOpacity(const QSGItem* item)
+static float computeEffectiveOpacity(const QQuickItem* item)
{
if (!item)
return 1.0;
@@ -205,7 +205,7 @@
{
if (change == ItemSceneChange)
initSceneGraphConnections();
- QSGItem::itemChange(change, data);
+ QQuickItem::itemChange(change, data);
}
#include "moc_qtouchwebpage.cpp"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
