aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickpopup.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-21 15:33:11 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-21 19:54:25 +0000
commit40aa7c39671400d96cf5f87fa737264912585ca0 (patch)
treedf2c4f2f7860af2966809c562d3320e7b4151248 /src/templates/qquickpopup.cpp
parent9d590d6313ba579a2c2112e4b314cacd05d09a50 (diff)
Popup: make ApplicationWindow attached properties available
Change-Id: Idde9fb49c222abc1ceabd15256695fd1961a9f76 Task-number: QTBUG-51991 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickpopup.cpp')
-rw-r--r--src/templates/qquickpopup.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index ab36e4cc..f0866bdd 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -1285,6 +1285,8 @@ void QQuickPopup::setParentItem(QQuickItem *parent)
if (d->parentItem == parent)
return;
+ QQuickWindow *oldWindow = window();
+
d->parentItem = parent;
if (d->positioner.parentItem())
d->positioner.setParentItem(parent);
@@ -1295,6 +1297,10 @@ void QQuickPopup::setParentItem(QQuickItem *parent)
p->updateLocale(window->locale(), false); // explicit=false
}
emit parentChanged();
+
+ QQuickWindow *newWindow = window();
+ if (oldWindow != newWindow)
+ emit windowChanged(newWindow);
}
/*!