summaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/qt5.yaml
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-01-27 12:53:03 +0100
committerLars Knoll <lars.knoll@qt.io>2020-01-27 15:41:37 +0100
commit4e4e7a9679c94112a367597ef1b9579dcfbe09e6 (patch)
tree57277909f512ad175f8f20060ff9350eeb8dbe5a /coin/platform_configs/qt5.yaml
parentb2f62bb9062a215dc805fcf5b0dd2119498880e0 (diff)
Update macOS WebAssembly and Android builds to use 10.14
macOS 10.13 doesn't support C++17, and will get removed soon. Change-Id: I5ed50df99d8582349adfd04e59ce89dd49701f76 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'coin/platform_configs/qt5.yaml')
-rw-r--r--coin/platform_configs/qt5.yaml5
1 files changed, 2 insertions, 3 deletions
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 2c37f1c5..d3046856 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -17,7 +17,7 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Clang'
@@ -25,14 +25,13 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64'
-
--
Template: 'qtci-windows-10-x86_64-15'
Target os: 'WebAssembly'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.14-x86_64'
Target os: 'WebAssembly'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']