Merge remote-tracking branch 'origin/8.0'

Conflicts: src/plugins/remotelinux/killappstep.cpp Change-Id: I4360e7d0f2c2ac258613933de81e8a9c40387379
2022-09-02 10:12:40 +02:00
parent b7398f7e0e e4bc08fb21
commit 9c708b79ce
4 changed files with 5 additions and 5 deletions
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1353,7 +1353,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
        if (info.buildDirectory.isEmpty()) {
            setBuildDirectory(shadowBuildDirectory(target->project()->projectFilePath(),
                                                   k,
-                                                   info.displayName,
+                                                   info.typeName,
                                                   info.buildType));
        }