diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-04 08:08:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-04 09:41:19 +0200 |
commit | f9801f90f684dd75b93b4d84ecc299912c728d7a (patch) | |
tree | 637c2be6f8189e84c35730d4c95358d46114f683 /coin/platform_configs | |
parent | 314d3efaf096a933bf550266d3c6cacc28af35eb (diff) | |
parent | 80791b03ee245b893e638a78508f1fa957f0b08d (diff) |
Merge remote-tracking branch 'origin/5.13.1' into 5.14
Conflicts:
coin/platform_configs/qt5.yaml
5.14 is using NDK r20 for android.
Change-Id: I483a628abd154c40937a44e196643a2be2552987
Fixes: QTBUG-77999
Diffstat (limited to 'coin/platform_configs')
-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 c164eb44..95ce332c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -43,6 +43,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' - + 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-r20 -android-ndk-host linux-x86_64 -android-arch x86_64' +- Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' Target arch: 'armv7' @@ -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-r20 -android-arch x86' - + 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-r20 -android-arch x86_64' +- Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' Target arch: 'armv7' @@ -92,6 +108,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-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' + 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_64' +- + Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' Target arch: 'x86' Compiler: 'GCC' |