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

QtSupport: Remove legacy code

Browse Source 
Change-Id: Ie7578d34466fb6c4d2f7e77e513caec253e7c813
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-11 14:18:19 +01:00
parent 2ab5561b9a
commit 4416eecc02
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -64,17 +64,6 @@ QVariant QtKitInformation::defaultValue(const Kit *k) const
if (result) if (result)
return result->uniqueId(); return result->uniqueId();
// Legacy: Check for system qmake path: Remove in 3.5 (or later):
// This check is expensive as it will potentially run binaries (qmake --version)!
const FileName qmakePath
= BuildableHelperLibrary::findSystemQt(Utils::Environment::systemEnvironment());
if (!qmakePath.isEmpty()) {
result = findOrDefault(versionList, equal(&BaseQtVersion::qmakeCommand, qmakePath));
if (result)
return result->uniqueId();
}
// Use *any* desktop Qt: // Use *any* desktop Qt:
result = findOrDefault(versionList, equal(&BaseQtVersion::type, result = findOrDefault(versionList, equal(&BaseQtVersion::type,
QString::fromLatin1(QtSupport::Constants::DESKTOPQT))); QString::fromLatin1(QtSupport::Constants::DESKTOPQT)));