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

Rename Abi::MacOS/GenericMacFlavor to DarwinOS/GenericDarwinFlavor

Browse Source 
This makes clear that the ABI encompasses all Darwin platforms (macOS,
iOS, tvOS, watchOS) in the wake of the OS X to macOS rename, and would
have been more technically correct anyways since ABIs are far below the
"macOS" parts of our favorite desktop Unix operating system.

Change-Id: I16d1477f44ffe70e5d8cddd67199a1602ba6fd97
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jake Petroules
2016-07-25 18:39:16 -07:00
parent 8393b35af9
commit f41b48ef5d
12 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1464,7 +1464,7 @@ void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentDa
deploymentData.addFile(destDirFor(ti) + QLatin1Char('/') + targetFileName, targetPath);
break;
}
case Abi::MacOS: {
case Abi::DarwinOS: {
QString destDir = destDirFor(ti);
if (config.contains(QLatin1String("lib_bundle"))) {
destDir.append(QLatin1Char('/')).append(ti.target)
@@ -1543,7 +1543,7 @@ QString QmakeProject::executableFor(const QmakeProFileNode *node)
QString target;
switch (toolchain->targetAbi().os()) {
case Abi::MacOS:
case Abi::DarwinOS:
if (node->variableValue(ConfigVar).contains(QLatin1String("app_bundle"))) {
target = ti.target + QLatin1String(".app/Contents/MacOS/") + ti.target;
break;