aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/buildconfiguration.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-11-28 09:07:02 +0100
committerEike Ziller <eike.ziller@digia.com>2013-11-28 11:14:18 +0100
commite4d800ad4a2b7f29c302f43c0efaa7e592633cc7 (patch)
tree89acb0f25c0ed751f7f58f9ba57cae44d03b133a /src/plugins/projectexplorer/buildconfiguration.cpp
parente53ca2b5f616c074ef2dcc7a98856e93f221c21e (diff)
Add workaround for QTBUG-35143v3.0.0-rc1
!!! Revert again ASAP !!! Task-number: QTBUG-35143 Change-Id: I9eb724f07c7b6b49a7df0be4e1d4c76dac206af5 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
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;
}