From 4416eecc024e155438c7ed6399182dbff143bd0d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 11 Jan 2017 14:18:19 +0100 Subject: [PATCH] QtSupport: Remove legacy code Change-Id: Ie7578d34466fb6c4d2f7e77e513caec253e7c813 Reviewed-by: Tim Jenssen --- src/plugins/qtsupport/qtkitinformation.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 6589e1496d7..00410ed3d99 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -64,17 +64,6 @@ QVariant QtKitInformation::defaultValue(const Kit *k) const if (result) 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: result = findOrDefault(versionList, equal(&BaseQtVersion::type, QString::fromLatin1(QtSupport::Constants::DESKTOPQT)));