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

QMake: Make sure executable targets have executable suffixes

Browse Source 
Task-number: QTCREATORBUG-9022
Change-Id: Id885a81228090a18128b8d145b50d89294db31c2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2018-09-10 12:48:30 +02:00
parent 2b582ed455
commit 089cf07820
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -1347,8 +1347,11 @@ QString QmakeProject::executableFor(const QmakeProFile *file)
&& file->variableValue(Variable::Config).contains("app_bundle")) { && file->variableValue(Variable::Config).contains("app_bundle")) {
target = ti.target + ".app/Contents/MacOS/" + ti.target; target = ti.target + ".app/Contents/MacOS/" + ti.target;
} else { } else {
QString extension = file->singleVariableValue(Variable::TargetExt); const QString extension = file->singleVariableValue(Variable::TargetExt);
target = ti.target + extension; if (extension.isEmpty())
target = HostOsInfo::withExecutableSuffix(ti.target);
else
target = ti.target + extension;
} }
return QDir(destDirFor(ti).toString()).absoluteFilePath(target); return QDir(destDirFor(ti).toString()).absoluteFilePath(target);
} }