From 29488fbdafa4da33b343dc26b208622d0bb58315 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 19 Mar 2020 17:13:51 +0100 Subject: [PATCH] Qbs: Suppress spurious warnings about mismatching compiler paths Apparently, MSVC toolchains set their compiler paths asynchronously, so don't complain if it's empty initially. Fixes: QTCREATORBUG-23725 Change-Id: Id800fa01d6368d244ec879181d12f6f7c7f1bf0a Reviewed-by: Kai Koehne --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 4f373b8ee34..d8f380e3b6f 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -353,7 +353,8 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor data.insert(QLatin1String(CPP_CXXCOMPILERNAME), cxxCompilerName); } - if (tcC && tcCxx && cFileInfo.absolutePath() != cxxFileInfo.absolutePath()) { + if (tcC && tcCxx && !cCompilerPath.isEmpty() && !cxxCompilerPath.isEmpty() + && cFileInfo.absolutePath() != cxxFileInfo.absolutePath()) { Core::MessageManager::write(tr("C and C++ compiler paths differ. C compiler may not work."), Core::MessageManager::ModeSwitch); }