diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-23 10:49:37 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-23 10:49:37 +0100 |
| commit | 5d4cbf4094c9b290626aab89e4bd92edd29ce49f (patch) | |
| tree | eac893652c724f057fba493688b16e212fd844dd /src/quick/items/qquickloader_p_p.h | |
| parent | 13cf5f02ce788f19a73e5d5c3da76e57291761a5 (diff) | |
| parent | 07cde200e55ee03bf9e2f9af89c20f91072deccc (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4object_p.h
Change-Id: Iff4d3aba7710a999b8befdc493cbe959e1ce02f9
Diffstat (limited to 'src/quick/items/qquickloader_p_p.h')
| -rw-r--r-- | src/quick/items/qquickloader_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index a0a9ca0601..9b6267e011 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_p_p.h @@ -84,7 +84,7 @@ public: QQuickLoaderPrivate(); ~QQuickLoaderPrivate(); - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &oldGeometry) Q_DECL_OVERRIDE; void itemImplicitWidthChanged(QQuickItem *) Q_DECL_OVERRIDE; void itemImplicitHeightChanged(QQuickItem *) Q_DECL_OVERRIDE; void clear(); |