diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-15 15:43:09 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-15 15:43:09 +0100 |
commit | ab027c7d786966ab87500ca609fd45b0551902c9 (patch) | |
tree | 55d496a604ae36f7ce9d8adae8160d3efab148a4 /src/quicktemplates2/qquickpopup_p_p.h | |
parent | 7b33addb8d8d1c07dda9a9f39d86f7bda812da82 (diff) | |
parent | 0edce6c41e9b193c7482334e313c4886c94702f1 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quicktemplates2/qquickpopup.cpp
Change-Id: I227b071476e569d13eebd7d11ed041fe30daa389
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index 1d25f922..2cf92864 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -94,6 +94,7 @@ public: } void init(); + void closeOrReject(); bool tryClose(QQuickItem *item, QMouseEvent *event); virtual void reposition(); virtual void resizeOverlay(); |