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

Docker: Disable msvc toolchain detection on container

Browse Source 
This avoids detecting desktop toolchains as on device and
mixing them up with toolchains used inside kits.
This also disables clang-cl toolchains on device as they
are Windows specific as well.

Change-Id: Icd098d605e3bcf8015f96fbef90e9f9ae2496603
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-07-15 16:09:35 +02:00
parent 64da7b15d9
commit 037d1283be
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -1861,7 +1861,10 @@ static void detectCppBuildTools2015(QList<ToolChain *> *list)
QList<ToolChain *> MsvcToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown, QList<ToolChain *> MsvcToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown,
const IDevice::Ptr &device) const IDevice::Ptr &device)
{ {
Q_UNUSED(device) if (!device.isNull()) {
// FIXME currently no support for msvc toolchains on a device
return {};
}
QList<ToolChain *> results; QList<ToolChain *> results;
@@ -1969,8 +1972,10 @@ QList<ToolChain *> ClangClToolChainFactory::autoDetect(const QList<ToolChain *>
const IDevice::Ptr &device) const IDevice::Ptr &device)
{ {
Q_UNUSED(alreadyKnown) Q_UNUSED(alreadyKnown)
Q_UNUSED(device) // FIXME: Use it. if (!device.isNull()) {
// FIXME currently no support for msvc toolchains on a device
return {};
}
#ifdef Q_OS_WIN64 #ifdef Q_OS_WIN64
const char registryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\LLVM\\LLVM"; const char registryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\LLVM\\LLVM";
#else #else