diff options
| -rw-r--r-- | src/lib/Qbs/sourceproject.cpp | 3 | ||||
| -rw-r--r-- | src/lib/language/loader.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Qbs/sourceproject.cpp b/src/lib/Qbs/sourceproject.cpp index bcbb8e81b..164ce7630 100644 --- a/src/lib/Qbs/sourceproject.cpp +++ b/src/lib/Qbs/sourceproject.cpp @@ -220,6 +220,9 @@ void SourceProject::loadProjectCommandLine(QFutureInterface<bool> &futureInterfa else profiles = d->settings->value("profile", "").toString().split(QChar(','), QString::SkipEmptyParts); + const QString combinedBuildProfileName = profiles.join(QLatin1String("-")); + buildCfg.insert("buildProfileName", combinedBuildProfileName); + // (2) bool profileError = false; for (int i = profiles.count() - 1; i >= 0; i--) { diff --git a/src/lib/language/loader.cpp b/src/lib/language/loader.cpp index 034b2520a..531ef374e 100644 --- a/src/lib/language/loader.cpp +++ b/src/lib/language/loader.cpp @@ -2749,7 +2749,7 @@ void Loader::resolveTopLevel(const ResolvedProject::Ptr &rproject, const QString targetOS = baseModule->scope->stringValue("targetOS"); const QString buildProfileName = baseModule->scope->stringValue("buildProfileName"); rproject->id = buildVariant; - if (!buildProfileName.isEmpty()) + if (!buildProfileName.isEmpty() && buildProfileName != QLatin1String("default")) rproject->id.prepend(buildProfileName + "-"); if (hostName != targetOS) { QString platformName = targetOS; |