diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-04-11 15:58:04 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-04-12 14:26:30 +0200 |
| commit | b4935b7adb14dd8ff539b97fbb47e72dbc581723 (patch) | |
| tree | f4c9bd2c3c2daeb9cc840a4cac1a86b27644fa8c | |
| parent | 8b1be47619d43857361349036b16a65e09d27d8f (diff) | |
Check for Darwin in general rather than merely OS X, where appropriate.
All usages of Darwin, OS X and iOS checks in QBS should now be correct.
Change-Id: I81f38bb6e73bc160bce89597e70e89ce76eaccd2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | share/qbs/imports/qbs/base/QmlApp.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/qt/core/qtcore.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/imports/qbs/base/QmlApp.qbs b/share/qbs/imports/qbs/base/QmlApp.qbs index ee0e75eed..3e83a0c83 100644 --- a/share/qbs/imports/qbs/base/QmlApp.qbs +++ b/share/qbs/imports/qbs/base/QmlApp.qbs @@ -1,7 +1,7 @@ import qbs 1.0 Product { - type: [qbs.targetOS == 'mac' ? "applicationbundle" : "application"] + type: qbs.targetPlatform.indexOf("darwin") !== -1 ? "applicationbundle" : "application" Depends { name: "qt"; submodules: ["core", "declarative"] } Depends { name: "cpp" } property string appViewerPath: localPath + "/qmlapplicationviewer" diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs index 09614bb49..3807c66a6 100644 --- a/share/qbs/modules/qt/core/qtcore.qbs +++ b/share/qbs/modules/qt/core/qtcore.qbs @@ -31,7 +31,7 @@ Module { property bool staticBuild property string generatedFilesDir: 'GeneratedFiles/' + product.name // ### TODO: changing this property does not change the path in the rule ATM. property string qmFilesDir: { - if (qbs.targetOS === "mac" && product.type.indexOf('applicationbundle') >= 0) + if (qbs.targetPlatform.indexOf("darwin") !== -1 && product.type.indexOf('applicationbundle') >= 0) return product.name + ".app/Contents/Resources"; return product.destinationDirectory; } |