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

QtSupport: Simplify detection of embedded linux Qt versions

Browse Source 
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 <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-09-27 15:14:35 +02:00
parent be61acffe7
commit 17f7b8e957
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qtsupport/qtversions.cpp
View File

@@ -127,15 +127,7 @@ EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
setSupportedType(EMBEDDED_LINUX_QT); setSupportedType(EMBEDDED_LINUX_QT);
setPriority(10); setPriority(10);
setRestrictionChecker([](const SetupData &) { setRestrictionChecker([](const SetupData &) { return false; });
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));
});
} }
} // Internal } // Internal