diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-11 16:40:53 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-13 15:01:45 +0000 |
| commit | c374fcac5f223fbf07afa98aa72d943e3339dac7 (patch) | |
| tree | 7809582877c99093cdac6472b59db041f0163b3a /src | |
| parent | 586c3855afb4ac4f704062cc9adb4e2fe5a4f80e (diff) | |
| download | qtquickcontrols-c374fcac5f223fbf07afa98aa72d943e3339dac7.tar.gz | |
Fix build after qtdeclarative change
Also silences 'hides overloaded virtual function' warnings
Change-Id: Id0bb6e01017fea78166a7cfacd921fd801dcb235
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/qquicksceneposlistener.cpp | 2 | ||||
| -rw-r--r-- | src/controls/Private/qquicksceneposlistener_p.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/Private/qquicksceneposlistener.cpp b/src/controls/Private/qquicksceneposlistener.cpp index 4e5a4a5e..872f1bf9 100644 --- a/src/controls/Private/qquicksceneposlistener.cpp +++ b/src/controls/Private/qquicksceneposlistener.cpp @@ -124,7 +124,7 @@ void QQuickScenePosListener1::setEnabled(bool enabled) emit enabledChanged(); } -void QQuickScenePosListener1::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) +void QQuickScenePosListener1::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) { updateScenePos(); } diff --git a/src/controls/Private/qquicksceneposlistener_p.h b/src/controls/Private/qquicksceneposlistener_p.h index f66930e7..61447c7d 100644 --- a/src/controls/Private/qquicksceneposlistener_p.h +++ b/src/controls/Private/qquicksceneposlistener_p.h @@ -73,10 +73,10 @@ Q_SIGNALS: void enabledChanged(); protected: - void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &); - void itemParentChanged(QQuickItem *, QQuickItem *parent); - void itemChildRemoved(QQuickItem *, QQuickItem *child); - void itemDestroyed(QQuickItem *item); + void itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) override; + void itemParentChanged(QQuickItem *, QQuickItem *parent) override; + void itemChildRemoved(QQuickItem *, QQuickItem *child) override; + void itemDestroyed(QQuickItem *item) override; private: void updateScenePos(); |