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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: I7a7bc552e09de1fbee98402c97e3a35f0e2c952a
This commit is contained in:
Eike Ziller
2019-07-31 08:27:20 +02:00
parent 86c4416af6 e425d88b6b
commit 7de82409fc
28 changed files with 214 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -357,10 +357,15 @@ Utils::CommandLine CMakeBuildStep::cmakeCommand(CMakeRunConfiguration *rc) const
QString target;
if (isCurrentExecutableTarget(m_buildTarget)) {
if (rc)
target = rc->buildKey().section('\n', 0, 0);
else
if (rc) {
target = rc->buildKey();
const int pos = target.indexOf("///::///");
if (pos >= 0) {
target = target.mid(pos + 8);
}
} else {
target = "<i>&lt;" + tr(ADD_RUNCONFIGURATION_TEXT) + "&gt;</i>";
}
} else {
target = m_buildTarget;
}