feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove all QT_VERSION_CHECK

Browse Source 
We only support Qt 5.6 now.

Change-Id: If94864400545b057623e3af0743c55ea1e84e33b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2016-08-03 22:54:19 +03:00
committed by Orgad Shaneh
parent 991498845a
commit a6c17fc537
11 changed files with 12 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/qtcprocess.cpp
View File

@@ -699,18 +699,6 @@ void QtcProcess::start()
qWarning("QtcProcess::start: Empty environment set when running '%s'.", qPrintable(m_command));
env = m_environment;
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
// QTBUG-49694
// If the process environment has no libraryPath,
// Qt will copy creator's libraryPath into the process environment.
// That's brain dead, and we work around it
if (osType != OsTypeWindows) { // a.k.a "Unixoid"
const QString libraryPath =
QLatin1String(osType == OsTypeMac ? "DYLD_LIBRARY_PATH" : "LD_LIBRARY_PATH");
if (env.constFind(libraryPath) == env.constEnd())
env.set(libraryPath, QString());
}
#endif
QProcess::setEnvironment(env.toStringList());
} else {
env = Environment::systemEnvironment();