aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickpopup_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-29 15:24:13 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-05-03 07:59:10 +0000
commit10d3752a2639d11d470a1b888cc6e92c627cb0d7 (patch)
tree3ae84a1897cafdd076036509b9573e0d028c7772 /src/quicktemplates2/qquickpopup_p_p.h
parent22bc04cf151d008e7bc1f825c5b55744144a0374 (diff)
QQuickPopup: listen to parent item's window changes
Emitting windowChanged() only in setParentItem() is unreliable, because the item might not yet have a window. Therefore we must listen to the parent item's windowChanged() signal. Change-Id: I237f81e0b06319516428c3c5d42352b228e753f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r--src/quicktemplates2/qquickpopup_p_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 7d367812..4518cd09 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -174,6 +174,8 @@ public:
void setRightMargin(qreal value, bool reset = false);
void setBottomMargin(qreal value, bool reset = false);
+ void setWindow(QQuickWindow *window);
+
bool focus;
bool modal;
bool dim;
@@ -197,6 +199,7 @@ public:
qreal contentHeight;
QQuickPopup::ClosePolicy closePolicy;
QQuickItem *parentItem;
+ QQuickWindow *window;
QQuickTransition *enter;
QQuickTransition *exit;
QQuickPopupItem *popupItem;