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

Docker: Register only matching toolchains

Browse Source 
Change-Id: I0d5b0f9686b4a8256167fc4f1b2b464885590e20
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-12-09 14:40:26 +01:00
parent a08a7dda46
commit 01d199ea82
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/docker/dockerdevice.cpp
View File

@@ -806,10 +806,18 @@ void KitDetectorPrivate::autoDetect()
DeviceTypeKitAspect::setDeviceTypeId(k, Constants::DOCKER_DEVICE_TYPE); DeviceTypeKitAspect::setDeviceTypeId(k, Constants::DOCKER_DEVICE_TYPE);
DeviceKitAspect::setDevice(k, m_device); DeviceKitAspect::setDevice(k, m_device);
for (ToolChain *tc : toolChains) QtVersion *qt = nullptr;
ToolChainKitAspect::setToolChain(k, tc); if (!qtVersions.isEmpty()) {
if (!qtVersions.isEmpty()) qt = qtVersions.at(0);
QtSupport::QtKitAspect::setQtVersion(k, qtVersions.at(0)); QtSupport::QtKitAspect::setQtVersion(k, qt);
}
Toolchains toolchainsToSet;
toolchainsToSet = ToolChainManager::toolchains([qt, this](const ToolChain *tc){
return tc->detectionSource() == m_sharedId
&& (!qt || qt->qtAbis().contains(tc->targetAbi()));
});
for (ToolChain *toolChain : toolchainsToSet)
ToolChainKitAspect::setToolChain(k, toolChain);
k->setSticky(ToolChainKitAspect::id(), true); k->setSticky(ToolChainKitAspect::id(), true);
k->setSticky(QtSupport::QtKitAspect::id(), true); k->setSticky(QtSupport::QtKitAspect::id(), true);