diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
commit | c3cc73e3087db62a8427ff569abff1a8289dae83 (patch) | |
tree | 9839a823f220f57775a732658b8aab0fa4ba9be3 /src/quicktemplates2/qquickpopup.cpp | |
parent | 2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff) | |
parent | bc514fba81b67afb41ee91ea917352ad674630a5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 4dd07b07..9b541803 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -427,6 +427,9 @@ void QQuickPopupPrivate::setWindow(QQuickWindow *newWindow) window = newWindow; emit q->windowChanged(newWindow); + + if (complete && visible && window) + transitionManager.transitionEnter(); } void QQuickPopupPrivate::itemDestroyed(QQuickItem *item) @@ -1729,15 +1732,17 @@ void QQuickPopup::classBegin() void QQuickPopup::componentComplete() { Q_D(QQuickPopup); - d->complete = true; if (!parentItem()) { if (QQuickItem *item = qobject_cast<QQuickItem *>(parent())) setParentItem(item); else if (QQuickWindow *window = qobject_cast<QQuickWindow *>(parent())) setParentItem(window->contentItem()); } - if (d->visible) + + if (d->visible && d->window) d->transitionManager.transitionEnter(); + + d->complete = true; d->popupItem->componentComplete(); } |