From 17f7b8e957684a20305e0efa88436bc5031891b6 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 27 Sep 2019 15:14:35 +0200 Subject: [PATCH] QtSupport: Simplify detection of embedded linux Qt versions The temporary Qt version never has a qmake path set, so it always returns an empty list of qtAbis. Make that explicit:-) Change-Id: I74b65897e5a9daddae638a99c38fa1a95f8a3086 Reviewed-by: hjk --- src/plugins/qtsupport/qtversions.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/plugins/qtsupport/qtversions.cpp b/src/plugins/qtsupport/qtversions.cpp index 450f1dd8485..03825f2822c 100644 --- a/src/plugins/qtsupport/qtversions.cpp +++ b/src/plugins/qtsupport/qtversions.cpp @@ -127,15 +127,7 @@ EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory() setSupportedType(EMBEDDED_LINUX_QT); setPriority(10); - setRestrictionChecker([](const SetupData &) { - const EmbeddedLinuxQtVersion tempVersion; - const ProjectExplorer::Abis abis = tempVersion.qtAbis(); - - // Note: This fails for e.g. intel/meego cross builds on x86 linux machines. - return abis.count() == 1 - && abis.at(0).os() == ProjectExplorer::Abi::LinuxOS - && !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0)); - }); + setRestrictionChecker([](const SetupData &) { return false; }); } } // Internal