diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-11-28 09:07:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-11-28 11:14:18 +0100 |
| commit | e4d800ad4a2b7f29c302f43c0efaa7e592633cc7 (patch) | |
| tree | 89acb0f25c0ed751f7f58f9ba57cae44d03b133a /src/plugins/projectexplorer/localenvironmentaspect.cpp | |
| parent | e53ca2b5f616c074ef2dcc7a98856e93f221c21e (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/localenvironmentaspect.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/localenvironmentaspect.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/localenvironmentaspect.cpp b/src/plugins/projectexplorer/localenvironmentaspect.cpp index faef642a17..6d9268aba3 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())) |