diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2017-03-29 13:15:11 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2017-03-30 10:41:04 +0000 |
| commit | a59f209bb30d68f50d5861c69aae37a77b02b4bb (patch) | |
| tree | 21f7606e83bbedc7bb98cf6f8f2555c9f959ecda | |
| parent | 0683281b7b2552f0dc1351fc84f122d403293abe (diff) | |
| download | qt-creator-a59f209bb30d68f50d5861c69aae37a77b02b4bb.tar.gz | |
QmakePM: Fix executableFor() on macOS
Ensure that target is not empty and avoid storing a path instead of
the real executable.
Change-Id: I408a54befbbb7004773d04f4bdd3898469efbaa7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeproject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 2aff80e3f1..d2ce349211 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1312,9 +1312,9 @@ QString QmakeProject::executableFor(const QmakeProFile *file) TargetInformation ti = file->targetInformation(); QString target; - if (tc->targetAbi().os() == Abi::DarwinOS) { - if (file->variableValue(Variable::Config).contains(QLatin1String("app_bundle"))) - target = ti.target + QLatin1String(".app/Contents/MacOS/") + ti.target; + if (tc->targetAbi().os() == Abi::DarwinOS + && file->variableValue(Variable::Config).contains("app_bundle")) { + target = ti.target + ".app/Contents/MacOS/" + ti.target; } else { QString extension = file->singleVariableValue(Variable::TargetExt); target = ti.target + extension; |