Commit fd773ce5 authored by Eike Ziller's avatar Eike Ziller

Revert "Add workaround for QTBUG-35143"

It was just a shortterm hack for RC1
This reverts commit e4d800ad.

Change-Id: If4471a8e040c7f9517551914b092b7ad0cd6d1d7
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 4c2daa90
......@@ -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);
......
......@@ -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;
}
......
......@@ -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()))
......
......@@ -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) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment