Merge remote-tracking branch 'origin/3.0'

2013-11-29 11:50:41 +01:00
parent 2e8347a8c8 7fdc8071fc
commit 0e4de8c108
40 changed files with 1335 additions and 1237 deletions
--- 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) :