diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:25:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:37:07 +0200 |
| commit | 29befcc995ebb3572ebe082c28e0e01f47b2baa2 (patch) | |
| tree | a9b9bfe69aaa9278e548c34c027b997632768ea7 /coin/platform_configs/qt5.yaml | |
| parent | b90dc27784a9d78284518e12b80a0054ef560760 (diff) | |
| parent | cfef857815392831dc15075c98c53041689a01a4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
Diffstat (limited to 'coin/platform_configs/qt5.yaml')
| -rw-r--r-- | coin/platform_configs/qt5.yaml | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index d813c9cd..84fff9e9 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -37,11 +37,11 @@ - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' + Target arch: 'armv7' + Compiler: 'Clang' 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-r20 -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' @@ -51,6 +51,14 @@ 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-r20 -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' + 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-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' +- Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' Target arch: 'multi' @@ -77,14 +85,6 @@ - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' - Target arch: 'x86' - 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-r20 -android-arch x86' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'Mingw73' Target compiler: 'Clang' @@ -117,14 +117,6 @@ - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' - Target arch: 'x86' - 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 -android-arch x86' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'Clang' Target compiler: 'Clang' |