summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-07-15 13:07:05 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2016-07-15 13:52:56 +0000
commit903a6bb947bd55bc6f05cf021427e040c1355459 (patch)
tree02ebe84d2fe3e379f23239f785c81011bc4c8aa7
parente3c07a766d5ffd7734b6f44341b755de1f9363d4 (diff)
QQuickViewChangeListener::itemGeometryChanged(): new signature
Base-class QQuickItemChangeListener has changed the second parameter from a const QRectF& to a QQuickGeometryChange (qtdeclarative commit e2c296c46b3f922ed12f83b166b1493dfded480e, on branch dev) so revise qtwebview to keep up with it. Change-Id: Ia9ef713d48762ebd005d02c874e61b88a92e8c5d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/webview/qquickviewcontroller.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp
index 0295d1f..82bdb90 100644
--- a/src/webview/qquickviewcontroller.cpp
+++ b/src/webview/qquickviewcontroller.cpp
@@ -58,7 +58,7 @@ public:
~QQuickViewChangeListener();
inline void itemGeometryChanged(QQuickItem *,
- const QRectF &,
+ QQuickGeometryChange,
const QRectF &) Q_DECL_OVERRIDE;
void itemChildRemoved(QQuickItem *item, QQuickItem *child) Q_DECL_OVERRIDE;
void itemParentChanged(QQuickItem *item, QQuickItem *parent) Q_DECL_OVERRIDE;
@@ -89,7 +89,7 @@ QQuickViewChangeListener::~QQuickViewChangeListener()
removeAncestorListeners(m_item->parentItem(), changeMask);
}
-void QQuickViewChangeListener::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &)
+void QQuickViewChangeListener::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &)
{
m_item->polish();
}