diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:23:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:31:44 +0200 |
| commit | 9530cc3d4faeae92eba5ade6239a622630872560 (patch) | |
| tree | 8c34541a430977c7a89bfd166029a3753387580e /src/quicktemplates2/qquickoverlay_p_p.h | |
| parent | 068379a66f88b34545530a018c0826c2c09a100a (diff) | |
| parent | 63f2f55462f2f040cfe175ada8aa1e01168597fc (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/popup/tst_popup.cpp
Change-Id: I32e6c6b646a00f8805cb82d181417db60a6fe6c8
Diffstat (limited to 'src/quicktemplates2/qquickoverlay_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickoverlay_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates2/qquickoverlay_p_p.h index 772b9b09..a290ecc2 100644 --- a/src/quicktemplates2/qquickoverlay_p_p.h +++ b/src/quicktemplates2/qquickoverlay_p_p.h @@ -89,6 +89,8 @@ public: void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; + void updateGeometry(); + QQmlComponent *modal; QQmlComponent *modeless; QVector<QQuickPopup *> allPopups; |