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

 Conflicts:
	tools/qmlscene/main.cpp

Change-Id: Idd6e05582ade4def1a3907f9622a8e132bec6bf7

1 files changed, 7 insertions, 2 deletions

diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri
index f08e8b7863..ddd7fb7f4c 100644
--- a/src/quick/scenegraph/scenegraph.pri
+++ b/src/quick/scenegraph/scenegraph.pri
@@ -115,7 +115,6 @@ qtConfig(opengl(es1|es2)?) {
         $$PWD/util/qsgdefaultimagenode.cpp \
         $$PWD/util/qsgdefaultninepatchnode.cpp \
         $$PWD/qsgdefaultlayer.cpp \
-        $$PWD/qsgthreadedrenderloop.cpp \
         $$PWD/qsgwindowsrenderloop.cpp
     HEADERS += \
         $$PWD/qsgdefaultglyphnode_p.h \
@@ -132,9 +131,15 @@ qtConfig(opengl(es1|es2)?) {
         $$PWD/util/qsgdefaultimagenode_p.h \
         $$PWD/util/qsgdefaultninepatchnode_p.h \
         $$PWD/qsgdefaultlayer_p.h \
-        $$PWD/qsgthreadedrenderloop_p.h \
         $$PWD/qsgwindowsrenderloop_p.h
 
+    qtConfig(thread) {
+        SOURCES += \
+            $$PWD/qsgthreadedrenderloop.cpp
+        HEADERS += \
+            $$PWD/qsgthreadedrenderloop_p.h
+    }
+
     qtConfig(quick-sprite) {
         SOURCES += \
             $$PWD/qsgdefaultspritenode.cpp