Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
	src/quicktemplates2/qquicktextarea.cpp
	src/quicktemplates2/qquicktextfield.cpp

Change-Id: Ie80a2d3bcbb961a38e3dffa247547d3d860c231a

1 files changed, 7 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index ace82553..9cdb194e 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)
@@ -1728,15 +1731,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();
 }