lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-02 02:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update macOS WebAssembly and Android builds to use 10.14

Browse Source 
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>
This commit is contained in:
Lars Knoll
2020-01-27 12:53:03 +01:00
parent b2f62bb906
commit 4e4e7a9679
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coin/platform_configs/qt5.yaml
View File

@@ -17,14 +17,13 @@
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'
Target compiler: 'Clang'
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'
@@ -32,7 +31,7 @@
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']