feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Add workaround for QTBUG-35143"

Browse Source 
It was just a shortterm hack for RC1
This reverts commit e4d800ad4a.

Change-Id: If4471a8e040c7f9517551914b092b7ad0cd6d1d7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eike Ziller
2013-11-29 16:29:13 +01:00
parent 4c2daa90ce
commit fd773ce5a8
4 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/main.cpp
View File

@@ -298,7 +298,6 @@ int main(int argc, char **argv)
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
// QML is unusable with the xlib backend // QML is unusable with the xlib backend
QApplication::setGraphicsSystem(QLatin1String("raster")); QApplication::setGraphicsSystem(QLatin1String("raster"));
qputenv("QSG_RENDER_LOOP", "basic"); // workaround for QTBUG-35143
#endif #endif
SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv); SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);

10
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -250,16 +250,8 @@ Target *BuildConfiguration::target() const
Utils::Environment BuildConfiguration::baseEnvironment() const Utils::Environment BuildConfiguration::baseEnvironment() const
{ {
Utils::Environment result; Utils::Environment result;
if (useSystemEnvironment()) { if (useSystemEnvironment())
#if 1
// workaround for QTBUG-35143
result = Utils::Environment::systemEnvironment(); result = Utils::Environment::systemEnvironment();
result.unset(QLatin1String("QSG_RENDER_LOOP"));
#else
result = Utils::Environment::systemEnvironment();
#endif
}
target()->kit()->addToEnvironment(result); target()->kit()->addToEnvironment(result);
return result; return result;
} }

12
src/plugins/projectexplorer/localenvironmentaspect.cpp
View File

@@ -69,23 +69,11 @@ Utils::Environment LocalEnvironmentAspect::baseEnvironment() const
if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration()) { if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration()) {
env = bc->environment(); env = bc->environment();
} else { // Fallback for targets without buildconfigurations: } else { // Fallback for targets without buildconfigurations:
#if 1
// workaround for QTBUG-35143
env = Utils::Environment::systemEnvironment(); env = Utils::Environment::systemEnvironment();
env.unset(QLatin1String("QSG_RENDER_LOOP"));
#else
env = Utils::Environment::systemEnvironment();
#endif
runConfiguration()->target()->kit()->addToEnvironment(env); runConfiguration()->target()->kit()->addToEnvironment(env);
} }
} else if (base == static_cast<int>(SystemEnvironmentBase)) { } else if (base == static_cast<int>(SystemEnvironmentBase)) {
#if 1
// workaround for QTBUG-35143
env = Utils::Environment::systemEnvironment(); 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())) if (const LocalApplicationRunConfiguration *rc = qobject_cast<const LocalApplicationRunConfiguration *>(runConfiguration()))

7
src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
View File

@@ -51,14 +51,7 @@ QString QmlProjectEnvironmentAspect::baseEnvironmentDisplayName(int base) const
Utils::Environment QmlProjectManager::QmlProjectEnvironmentAspect::baseEnvironment() 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(); return Utils::Environment::systemEnvironment();
#endif
} }
QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) : QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :