diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-09-25 21:59:51 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-11-20 06:20:09 +0000 |
| commit | a0ab55da7b91f00701de9a11a482dd12ba8192b4 (patch) | |
| tree | 1758928e093c73ddeedbc9ced4fefa0ff7a4509d /.travis.yml | |
| parent | 55150b612f09bb4f295df7ffa2c7fccc38d70bf1 (diff) | |
Add Xcode 11 to CI
This requires Qbs 1.14.1. And while we are at it, we can also upgrade Qt to
5.12.6 in all environments.
Task-number: QBS-1495
Change-Id: Iddb067cca37956f93c9bdf2acc95b2282a232b2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 208ae94a2..ddf2f1449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ git: env: global: - QT_INSTALL_DIR=~/Qt - - QT_VERSION=5.12.5 - - QTCREATOR_VERSION=4.10.1 + - QT_VERSION=5.12.6 + - QTCREATOR_VERSION=4.10.2 stages: - name: Build Qbs and and run autotests @@ -69,6 +69,10 @@ jobs: - qbs config defaultProfile qt - scripts/build-qbs-with-qbs.sh + - <<: *build-on-macos + name: With Qbs on macOS (xcode 11) + osx_image: xcode11 + - &build-on-windows stage: Build Qbs and and run autotests name: With Qbs on Windows (Visual Studio 2017) |