From 61932b5d4b16eb2d6c4bf70d8b7138b1c21f0f40 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 18 Feb 2020 15:07:53 +0100 Subject: [PATCH] QbsProjectManager: Use the same build key as in previous versions We changed the build key derivation method in commit 6913947986 under the assumption that it doesn't really matter as long as it's unique. However, this value gets serialized, so the change broke restoring existing qbs run configurations. As we don't want users to lose all their run configs when upgrading to 4.12, we switch back to the old pattern. Change-Id: Ia4a353af08cca33dbc3c60bd9fc0e28f42dcfe20 Reviewed-by: hjk --- src/plugins/qbsprojectmanager/qbsproject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index b915107202a..3bbf4501283 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -1069,12 +1069,13 @@ void QbsBuildSystem::updateApplicationTargets() } } BuildTargetInfo bti; - bti.buildKey = productData.value("full-display-name").toString(); + bti.buildKey = productData.value("name").toString() + '.' + + productData.value("multiplex-configuration-id").toString(); bti.targetFilePath = FilePath::fromString(targetFile); bti.projectFilePath = FilePath::fromString(projectFile); bti.isQtcRunnable = isQtcRunnable; // Fixed up below. bti.usesTerminal = usesTerminal; - bti.displayName = bti.buildKey; + bti.displayName = productData.value("full-display-name").toString(); bti.runEnvModifier = [targetFile, productData, this](Utils::Environment &env, bool usingLibraryPaths) { const QString productName = productData.value("full-display-name").toString(); if (session()->projectData().isEmpty())