diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-06-13 14:47:13 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-14 10:02:06 +0200 |
| commit | b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230 (patch) | |
| tree | 21a11f25139c129561d6830932a9eee4f2be895d /platform/qt | |
| parent | 1e41c151f6edfba69037c854a5cb7abc18bb55e7 (diff) | |
| download | qtlocation-mapboxgl-b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230.tar.gz | |
[macos] Renamed OS X SDK to macOS SDK
Also renamed as many references to OS X as possible to macOS in documentation.
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/README.md | 6 | ||||
| -rw-r--r-- | platform/qt/bitrise-qt4.yml | 4 | ||||
| -rw-r--r-- | platform/qt/bitrise-qt5.yml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/platform/qt/README.md b/platform/qt/README.md index d763682717..e5ec7e3bb0 100644 --- a/platform/qt/README.md +++ b/platform/qt/README.md @@ -19,7 +19,7 @@ example](https://c2.staticflickr.com/8/7689/26247088394_01541b34de_o.png) ### Developing [Qt supports many platforms](https://www.qt.io/qt-framework/#section-4) - so far -we have been testing our code on Linux and OS X desktops, as well as embedded +we have been testing our code on Linux and macOS desktops, as well as embedded devices such as Raspberry Pi 3. If you need to maintain backwards compatibility with prior releases of @@ -47,9 +47,9 @@ you also need: qml-module-qtquick2 qml-module-qtpositioning qml-module-qtgraphicaleffects \ qml-module-qtquick-layouts qml-module-qtquick-controls -#### OS X +#### macOS -For OS X desktop, you can install Qt 5 via [Homebrew](http://brew.sh): +For macOS desktop, you can install Qt 5 via [Homebrew](http://brew.sh): brew install qt5 diff --git a/platform/qt/bitrise-qt4.yml b/platform/qt/bitrise-qt4.yml index 83c222a9db..24e0f44932 100644 --- a/platform/qt/bitrise-qt4.yml +++ b/platform/qt/bitrise-qt4.yml @@ -42,8 +42,8 @@ workflows: inputs: - webhook_url: "$SLACK_HOOK_URL" - channel: "#gl-bots" - - from_username: 'Bitrise Qt4 OS X' - - from_username_on_error: 'Bitrise Qt4 OS X' + - from_username: 'Bitrise Qt4 macOS' + - from_username_on_error: 'Bitrise Qt4 macOS' - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> by ${GIT_CLONE_COMMIT_COMMITER_NAME} diff --git a/platform/qt/bitrise-qt5.yml b/platform/qt/bitrise-qt5.yml index 1e767b3169..18fa44dd2c 100644 --- a/platform/qt/bitrise-qt5.yml +++ b/platform/qt/bitrise-qt5.yml @@ -43,8 +43,8 @@ workflows: inputs: - webhook_url: "$SLACK_HOOK_URL" - channel: "#gl-bots" - - from_username: 'Bitrise Qt5 OS X' - - from_username_on_error: 'Bitrise Qt5 OS X' + - from_username: 'Bitrise Qt5 macOS' + - from_username_on_error: 'Bitrise Qt5 macOS' - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}> by ${GIT_CLONE_COMMIT_COMMITER_NAME} |