aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/buildconfiguration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/projectexplorer/buildconfiguration.cpp')
-rw-r--r--src/plugins/projectexplorer/buildconfiguration.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index fb1f5a32c6..ca460ca540 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;
}