From a97f1bd0bb93acd310469a545ff6875ada7252e9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 18 Oct 2016 17:34:17 +0200 Subject: [PATCH] QbsProjectManager: Do not set an empty compiler name If one of the two compiler types in the Kit is not set, leave the respective value in qbs at its default. Things will likely work anyway, whereas setting an empty compiler name is guaranteed to break. Task-number: QTCREATORBUG-17109 Change-Id: I2b4153cb9a9daafb2f57659e16622e00d3921005 Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 9fbeb73176f..a83e814a300 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -263,8 +263,10 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor if (toolchain.contains(QLatin1String("msvc"))) { data.insert(QLatin1String(CPP_COMPILERNAME), mainCompilerName); } else { - data.insert(QLatin1String(CPP_COMPILERNAME), cCompilerName); - data.insert(QLatin1String(CPP_CXXCOMPILERNAME), cxxCompilerName); + if (!cCompilerName.isEmpty()) + data.insert(QLatin1String(CPP_COMPILERNAME), cCompilerName); + if (!cxxCompilerName.isEmpty()) + data.insert(QLatin1String(CPP_CXXCOMPILERNAME), cxxCompilerName); } if (tcC && tcCxx && cFileInfo.absolutePath() != cxxFileInfo.absolutePath()) {