← Back to branch summary

~iahmad/kubuntu-packaging/qtcreator

« back to all changes in this revision

Viewing changes to src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp

  • Committer: Timo Jyrinki
  • Date: 2014-01-15 07:44:24 UTC
  • mfrom: (1.1.30)
  • Revision ID: timo.jyrinki@canonical.com-20140115074424-3pnj3a1x6s25im9v
Import upstream version 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
51
51
 
52
52
Utils::Environment QmlProjectManager::QmlProjectEnvironmentAspect::baseEnvironment() const
53
53
{
54
 
#if 1
55
 
    // workaround for QTBUG-35143
56
 
    Utils::Environment env = Utils::Environment::systemEnvironment();
57
 
    env.unset(QLatin1String("QSG_RENDER_LOOP"));
58
 
    return env;
59
 
#else
60
54
    return Utils::Environment::systemEnvironment();
61
 
#endif
62
55
}
63
56
 
64
57
QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :