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

Qmake: Use target-specific extension for deployment

Browse Source 
Add file extensions to execatables about to be deployed based on the
OS found in the toolchain's targetAbi instead of using the hostOs().

This should fix deployment from windows to non-windows machines.

Task-number: QTCREATORBUG-21608
Change-Id: I83678bda1d56ff24848b7b498b95081d00b5a5f0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
(cherry picked from commit 383f0b9fcc)
This commit is contained in:
Tobias Hunger
2018-11-30 11:10:02 +01:00
committed by Eike Ziller
parent 185f8985c6
commit f0226d9644
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1347,7 +1347,7 @@ QString QmakeProject::executableFor(const QmakeProFile *file)
} else {
const QString extension = file->singleVariableValue(Variable::TargetExt);
if (extension.isEmpty())
target = HostOsInfo::withExecutableSuffix(ti.target);
target = OsSpecificAspects::withExecutableSuffix(Abi::abiOsToOsType(tc->targetAbi().os()), ti.target);
else
target = ti.target + extension;
}