← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/projectexplorer/localenvironmentaspect.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-12-02 09:16:15 UTC
  • mfrom: (1.1.29)
  • Revision ID: timo.jyrinki@canonical.com-20131202091615-xbj1os1f604ber1m
New upstream release candidate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/projectexplorer/localenvironmentaspect.cpp
69
69
        if (BuildConfiguration *bc = runConfiguration()->target()->activeBuildConfiguration()) {
70
70
            env = bc->environment();
71
71
        } else { // Fallback for targets without buildconfigurations:
72
 
            env = Utils::Environment::systemEnvironment();
 
72
#if 1
 
73
            // workaround for QTBUG-35143
 
74
            env = Utils::Environment::systemEnvironment();
 
75
            env.unset(QLatin1String("QSG_RENDER_LOOP"));
 
76
#else
 
77
            env = Utils::Environment::systemEnvironment();
 
78
#endif
73
79
            runConfiguration()->target()->kit()->addToEnvironment(env);
74
80
        }
75
81
    } else if (base == static_cast<int>(SystemEnvironmentBase)) {
76
 
        env = Utils::Environment::systemEnvironment();
 
82
#if 1
 
83
            // workaround for QTBUG-35143
 
84
            env = Utils::Environment::systemEnvironment();
 
85
            env.unset(QLatin1String("QSG_RENDER_LOOP"));
 
86
#else
 
87
            env = Utils::Environment::systemEnvironment();
 
88
#endif
77
89
    }
78
90
 
79
91
    if (const LocalApplicationRunConfiguration *rc = qobject_cast<const LocalApplicationRunConfiguration *>(runConfiguration()))