diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:44 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:51 +0200 |
| commit | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (patch) | |
| tree | 4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /src/quicktemplates2/qquickoverlay_p.h | |
| parent | 94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff) | |
| parent | 3703d57161dc4ad7df000403bfcc43ac78eb6617 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/quicktemplates2/qquickoverlay_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickoverlay_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h index 0d8bccf5..1d238163 100644 --- a/src/quicktemplates2/qquickoverlay_p.h +++ b/src/quicktemplates2/qquickoverlay_p.h @@ -86,7 +86,7 @@ Q_SIGNALS: protected: void itemChange(ItemChange change, const ItemChangeData &data) override; - void geometryChanged(const QRectF &oldGeometry, const QRectF &newGeometry) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; |