diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:55:29 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-28 08:20:12 +0100 |
| commit | 661bba4f11666d5d9018a6a1d16a71c324bdf123 (patch) | |
| tree | b4abcb5acf9ce2efd6f39b90ab176eedcce978c3 /src/quicktemplates2/qquickoverlay_p_p.h | |
| parent | 52d042e8a0324dbb05fb4f46fb9ea774ec168697 (diff) | |
| parent | 6aa97038e26bab96455b2fc3febc5d358a5e7599 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
sync.profile
Change-Id: I554c40516030075142f9af1dd5c66fdca2b78b9a
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 ef142f1b..b10bfe83 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(); |