From e4d800ad4a2b7f29c302f43c0efaa7e592633cc7 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 28 Nov 2013 09:07:02 +0100 Subject: Add workaround for QTBUG-35143 !!! Revert again ASAP !!! Task-number: QTBUG-35143 Change-Id: I9eb724f07c7b6b49a7df0be4e1d4c76dac206af5 Reviewed-by: Eike Ziller --- src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp') 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) : -- cgit v1.2.1