diff options
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.cpp | 10 | ||||
-rw-r--r-- | src/plugins/projectexplorer/localenvironmentaspect.cpp | 14 |
2 files changed, 22 insertions, 2 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; } 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())) |