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

Change-Id: I0ad1a3aa3a211ef86c4baf605361de860266dde1

3 files changed, 10 insertions, 10 deletions

diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index ec74660d96..025acefec2 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -312,9 +312,6 @@ bool QQuickRenderControl::sync()
 void QQuickRenderControl::invalidate()
 {
     Q_D(QQuickRenderControl);
-    if (!d->initialized)
-        return;
-
     if (!d->window)
         return;
 
@@ -322,6 +319,9 @@ void QQuickRenderControl::invalidate()
     cd->fireAboutToStop();
     cd->cleanupNodesOnShutdown();
 
+    if (!d->initialized)
+        return;
+
     // We must invalidate since the context can potentially be destroyed by the
     // application right after returning from this function. Invalidating is
     // also essential to allow a subsequent initialize() to succeed.
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index 24467a3701..63f3b91b82 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -55,11 +55,6 @@
 #include <qqmlproperty.h>
 #include <QtCore/QPointer>
 
-static void initResources()
-{
-    Q_INIT_RESOURCE(scenegraph);
-}
-
 QT_BEGIN_NAMESPACE
 
 #if !QT_CONFIG(qml_debug)
@@ -185,8 +180,6 @@ void QQmlQtQuick2DebugStatesDelegate::resetBindingForInvalidProperty(QObject *ob
 
 void QQmlQtQuick2Module::defineModule()
 {
-    initResources();
-
     QQuick_initializeProviders();
 
     QQuickUtilModule::defineModule();
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp
index 9a0ac66690..1124bf1727 100644
--- a/src/quick/scenegraph/qsgdefaultcontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultcontext.cpp
@@ -290,3 +290,10 @@ QSGRendererInterface::ShaderSourceTypes QSGDefaultContext::shaderSourceType() co
 }
 
 QT_END_NAMESPACE
+
+static void initResources()
+{
+    Q_INIT_RESOURCE(scenegraph);
+}
+
+Q_CONSTRUCTOR_FUNCTION(initResources)