forked from qt-creator/qt-creator
Revert "Add workaround for QTBUG-35143"
It was just a shortterm hack for RC1
This reverts commit e4d800ad4a.
Change-Id: If4471a8e040c7f9517551914b092b7ad0cd6d1d7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -250,16 +250,8 @@ Target *BuildConfiguration::target() const
|
||||
Utils::Environment BuildConfiguration::baseEnvironment() const
|
||||
{
|
||||
Utils::Environment result;
|
||||
if (useSystemEnvironment()) {
|
||||
#if 1
|
||||
// workaround for QTBUG-35143
|
||||
if (useSystemEnvironment())
|
||||
result = Utils::Environment::systemEnvironment();
|
||||
result.unset(QLatin1String("QSG_RENDER_LOOP"));
|
||||
#else
|
||||
result = Utils::Environment::systemEnvironment();
|
||||
#endif
|
||||
}
|
||||
|
||||
target()->kit()->addToEnvironment(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user