diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-06 10:34:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-06 10:34:06 +0200 |
| commit | 742a20d0590d3a2b7d8f7e272c12124c9aba6fea (patch) | |
| tree | 02c71ac6a21a24f3f43d69b16a0bcd36496c0dc4 /src/quicktemplates2/qquickoverlay_p.h | |
| parent | 305c3cbfe3db51225ba30249cd70ed26a6c70c58 (diff) | |
| parent | 616c430d2b7f36e70987df7b2dc97e71f0e8b589 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.15
Change-Id: If5c2806e52efc9608e476c3f068ee5a0e67ffff7
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; |