diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 10:35:29 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 10:35:29 +0200 |
| commit | a9210349671ce374ceadfb03443c0b5d32280acb (patch) | |
| tree | c96811461a8ff284d48c079277eb3b5342bc3a24 /src/quicktemplates2/qquickoverlay_p.h | |
| parent | 8701410f8c0e179c9cca51b08fcc6491a288ee84 (diff) | |
| parent | 616c430d2b7f36e70987df7b2dc97e71f0e8b589 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I859406dc779e59ee5d8e2980e04f8be28b1a69aa
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; |