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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-11-29 16:36:13 +01:00
parent f921210053 fd773ce5a8
commit f7397224ea
17 changed files with 5872 additions and 1636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) :