diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 01:45:22 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 10:18:11 -0700 |
| commit | d17ea24c73b5b58fa6f5d3f00d82de6f53459cfc (patch) | |
| tree | 4cf939e70277190dad948b16849320e4452c5d78 /share/qbs/imports/qbs/DarwinTools | |
| parent | 440d78eca9011d13c88f0e0fd84f62661806eb49 (diff) | |
| parent | 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 (diff) | |
Merge 1.5 into 1.6
Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
Diffstat (limited to 'share/qbs/imports/qbs/DarwinTools')
| -rw-r--r-- | share/qbs/imports/qbs/DarwinTools/darwin-tools.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js index d33eb92e4..aceae7a92 100644 --- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js +++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js @@ -42,14 +42,14 @@ var _deviceMap = { var _platformMap = { "ios": "iPhone", - "osx": "MacOSX", + "macos": "MacOSX", "tvos": "AppleTV", "watchos": "Watch" }; var _platformDeviceMap = { "ios": ["iphone", "ipad"], - "osx": ["mac"], + "macos": ["mac"], "tvos": ["tv"], "watchos": ["watch"] } |