diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-11-28 09:07:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-11-28 11:14:18 +0100 |
| commit | e4d800ad4a2b7f29c302f43c0efaa7e592633cc7 (patch) | |
| tree | 89acb0f25c0ed751f7f58f9ba57cae44d03b133a /src/plugins/qmlprojectmanager | |
| parent | e53ca2b5f616c074ef2dcc7a98856e93f221c21e (diff) | |
| download | qt-creator-e4d800ad4a2b7f29c302f43c0efaa7e592633cc7.tar.gz | |
Add workaround for QTBUG-35143v3.0.0-rc1
!!! Revert again ASAP !!!
Task-number: QTBUG-35143
Change-Id: I9eb724f07c7b6b49a7df0be4e1d4c76dac206af5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp index cef5dfeee4..ab60581b20 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp @@ -51,7 +51,14 @@ 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) : |