diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:49:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:49:15 +0100 |
commit | 225c4a724e058851c9a2b4ffe6032b6f84cfd90c (patch) | |
tree | 8a28a9f8ef4d98d9e5536033b911d33c03f8b8c3 /src/quicktemplates2/qquickoverlay_p_p.h | |
parent | 6472d2541c83c1259a99b40216beaf48b56e94b4 (diff) | |
parent | 6f6e073815d5b05aba553b83809fb701541260c6 (diff) |
Merge remote-tracking branch 'origin/5.7.1' into 5.7
Change-Id: I74c00c0b5c36cc96db8bdbd7c1c2a77d6e37d6e7
Diffstat (limited to 'src/quicktemplates2/qquickoverlay_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickoverlay_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates2/qquickoverlay_p_p.h index 6201908e..6e72b39a 100644 --- a/src/quicktemplates2/qquickoverlay_p_p.h +++ b/src/quicktemplates2/qquickoverlay_p_p.h @@ -72,6 +72,7 @@ public: void addPopup(QQuickPopup *popup); void removePopup(QQuickPopup *popup); + void setMouseGrabberPopup(QQuickPopup *popup); void popupAboutToShow(); void popupAboutToHide(); |