diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-27 07:27:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-27 07:50:25 +0200 |
| commit | 0a0ec7ffe33d8d646ad700b2b7b26541ee910420 (patch) | |
| tree | 81963e4a61fb6188d8ab4e59df2d4b08d8b72b4d | |
| parent | c0fce7a3b37db53289ffd1e44c58f0bfc0601229 (diff) | |
| parent | 076fb6bd6de2a49877ef80b78b637da3526737b4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"
| -rw-r--r-- | coin/platform_configs/qt5.yaml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 49116bd3..208c47ed 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -45,6 +45,14 @@ - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86_64' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' @@ -67,6 +75,14 @@ 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-r19c -android-arch arm64-v8a' - + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Mingw73' + Target compiler: 'Clang' + 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-r19c -android-arch x86_64' +- Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' Target arch: 'armv7' @@ -84,6 +100,14 @@ 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-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' - Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'x86_64' + 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-r19c -android-ndk-host darwin-x86_64 -android-arch x86_64' +- + Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' Target arch: 'x86' Compiler: 'GCC' |