feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: I3e7049da2c3da6f784e3cb3407c22ada556e5d24
This commit is contained in:
Eike Ziller
2020-02-26 08:35:05 +01:00
parent 23946de457 fa59e02f89
commit 61dc14b67f
419 changed files with 18939 additions and 2729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -1067,12 +1067,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())