From fd773ce5a86c551b7ae185a1387cc265363bed99 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Fri, 29 Nov 2013 16:29:13 +0100
Subject: [PATCH] Revert "Add workaround for QTBUG-35143"
It was just a shortterm hack for RC1
This reverts commit e4d800ad4a2b7f29c302f43c0efaa7e592633cc7.
Change-Id: If4471a8e040c7f9517551914b092b7ad0cd6d1d7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/app/main.cpp | 1 -
src/plugins/projectexplorer/buildconfiguration.cpp | 10 +---------
.../projectexplorer/localenvironmentaspect.cpp | 14 +-------------
.../qmlprojectenvironmentaspect.cpp | 7 -------
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 69fda6f0ffa..da6f0716c7d 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -298,7 +298,6 @@ 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 ca460ca540c..fb1f5a32c62 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -250,16 +250,8 @@ Target *BuildConfiguration::target() const
Utils::Environment BuildConfiguration::baseEnvironment() const
{
Utils::Environment result;
- if (useSystemEnvironment()) {
-#if 1
- // workaround for QTBUG-35143
- result = Utils::Environment::systemEnvironment();
- result.unset(QLatin1String("QSG_RENDER_LOOP"));
-#else
+ if (useSystemEnvironment())
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 6d9268aba36..faef642a17c 100644
--- a/src/plugins/projectexplorer/localenvironmentaspect.cpp
+++ b/src/plugins/projectexplorer/localenvironmentaspect.cpp
@@ -69,23 +69,11 @@ 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)) {
-#if 1
- // workaround for QTBUG-35143
- env = Utils::Environment::systemEnvironment();
- env.unset(QLatin1String("QSG_RENDER_LOOP"));
-#else
- env = Utils::Environment::systemEnvironment();
-#endif
+ env = Utils::Environment::systemEnvironment();
}
if (const LocalApplicationRunConfiguration *rc = qobject_cast<const LocalApplicationRunConfiguration *>(runConfiguration()))
diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
index ab60581b20f..cef5dfeee43 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
@@ -51,14 +51,7 @@ 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) :
--
GitLab