Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/gui/painting/qdrawhelper.cpp

Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e

1 files changed, 3 insertions, 1 deletions

diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp
index d2680e5280..4b289d2d33 100644
--- a/src/widgets/kernel/qwindowcontainer.cpp
+++ b/src/widgets/kernel/qwindowcontainer.cpp
@@ -231,7 +231,7 @@ QWindowContainer::QWindowContainer(QWindow *embeddedWindow, QWidget *parent, Qt:
     QString windowName = d->window->objectName();
     if (windowName.isEmpty())
         windowName = QString::fromUtf8(d->window->metaObject()->className());
-    d->fakeParent.setObjectName(windowName + "ContainerFakeParent");
+    d->fakeParent.setObjectName(windowName + QLatin1String("ContainerFakeParent"));
 
     d->window->setParent(&d->fakeParent);
     setAcceptDrops(true);
@@ -315,6 +315,7 @@ bool QWindowContainer::event(QEvent *e)
             d->window->setParent(d->usesNativeWidgets
                                  ? windowHandle()
                                  : window()->windowHandle());
+            d->fakeParent.destroy();
         }
         if (d->window->parent()) {
             d->markParentChain();
@@ -404,6 +405,7 @@ void QWindowContainer::parentWasChanged(QWidget *parent)
                 Q_ASSERT(toplevel->windowHandle());
             }
             d->window->setParent(toplevel->windowHandle());
+            d->fakeParent.destroy();
             d->updateGeometry();
         }
     }