Add workaround for QTBUG-35143v3.0.0-rc1

!!! Revert again ASAP !!!

Task-number: QTBUG-35143
Change-Id: I9eb724f07c7b6b49a7df0be4e1d4c76dac206af5
Reviewed-by: Eike Ziller <[email protected]>

4 files changed, 30 insertions, 2 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index da6f0716c7d..69fda6f0ffa 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -298,6 +298,7 @@ int main(int argc, char **argv)
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     // QML is unusable with the xlib backend
     QApplication::setGraphicsSystem(QLatin1String("raster"));
+    qputenv("QSG_RENDER_LOOP", "basic"); // workaround for QTBUG-35143
 #endif
 
     SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index fb1f5a32c62..ca460ca540c 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -250,8 +250,16 @@ Target *BuildConfiguration::target() const
 Utils::Environment BuildConfiguration::baseEnvironment() const
 {
     Utils::Environment result;
-    if (useSystemEnvironment())
+    if (useSystemEnvironment()) {
+#if 1
+        // workaround for QTBUG-35143
+        result = Utils::Environment::systemEnvironment();
+        result.unset(QLatin1String("QSG_RENDER_LOOP"));
+#else
         result = Utils::Environment::systemEnvironment();
+#endif
+    }
+
     target()->kit()->addToEnvironment(result);
     return result;
 }
diff --git a/src/plugins/projectexplorer/localenvironmentaspect.cpp b/src/plugins/projectexplorer/localenvironmentaspect.cpp
index faef642a17c..6d9268aba36 100644
--- a/src/plugins/projectexplorer/localenvironmentaspect.cpp
+++ b/src/plugins/projectexplorer/localenvironmentaspect.cpp
@@ -69,11 +69,23 @@ Utils::Environment LocalEnvironmentAspect::baseEnvironment() const
         if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration()) {
             env = bc->environment();
         } else { // Fallback for targets without buildconfigurations:
+#if 1
+            // workaround for QTBUG-35143
             env = Utils::Environment::systemEnvironment();
+            env.unset(QLatin1String("QSG_RENDER_LOOP"));
+#else
+            env = Utils::Environment::systemEnvironment();
+#endif
             runConfiguration()->target()->kit()->addToEnvironment(env);
         }
     } else if (base == static_cast<int>(SystemEnvironmentBase)) {
-        env = Utils::Environment::systemEnvironment();
+#if 1
+            // workaround for QTBUG-35143
+            env = Utils::Environment::systemEnvironment();
+            env.unset(QLatin1String("QSG_RENDER_LOOP"));
+#else
+            env = Utils::Environment::systemEnvironment();
+#endif
     }
 
     if (const LocalApplicationRunConfiguration *rc = qobject_cast<const LocalApplicationRunConfiguration *>(runConfiguration()))
diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
index cef5dfeee43..ab60581b20f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
@@ -51,7 +51,14 @@ QString QmlProjectEnvironmentAspect::baseEnvironmentDisplayName(int base) const
 
 Utils::Environment QmlProjectManager::QmlProjectEnvironmentAspect::baseEnvironment() const
 {
+#if 1
+    // workaround for QTBUG-35143
+    Utils::Environment env = Utils::Environment::systemEnvironment();
+    env.unset(QLatin1String("QSG_RENDER_LOOP"));
+    return env;
+#else
     return Utils::Environment::systemEnvironment();
+#endif
 }
 
 QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :