diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:03:27 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:03:27 +0200 |
| commit | a4ecc76df944cce5152cdfc8fd27436390a4fa62 (patch) | |
| tree | c840006f08a790bf4c9ce362e98d826009f520fc /src/quicktemplates2/qquickpopup_p_p.h | |
| parent | 472750be915b7cab88c5daaca1246f58c6bd0f72 (diff) | |
| parent | a392194a575653dff3cd21227e6a1a2902b8399f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I25813bc151347f69d4dbd9f61729300626be763f
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index e32fdb28..8a85f914 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -187,7 +187,7 @@ public: QQuickPopup::ClosePolicy closePolicy = DefaultClosePolicy; QQuickItem *parentItem = nullptr; QQuickItem *dimmer = nullptr; - QQuickWindow *window = nullptr; + QPointer<QQuickWindow> window; QQuickTransition *enter = nullptr; QQuickTransition *exit = nullptr; QQuickPopupItem *popupItem = nullptr; |