Update submodules on '5.14' in qt/qt5

Change-Id: I97f37b6418a58b0546b7a8b7b91229db5229a81e Reviewed-by: Liang Qi <liang.qi@qt.io>
2026-02-26 08:55:26 +08:00 · 2019-10-03 06:12:11 +02:00 · 2019-10-01 06:10:51 +02:00 · 2019-09-30 06:26:37 +02:00 · 2019-09-28 07:03:09 +02:00 · 2019-09-27 09:20:43 +02:00
32 changed files with 54 additions and 30 deletions
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -114,6 +114,14 @@ Configurations:
    Compiler: 'Clang'
    Features: ['DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    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 -xplatform android-clang'
 -
    Template: 'qtci-linux-RHEL-7.6-x86_64'
    Target os: 'Android_ANY'
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -50,6 +50,14 @@
    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: 'multi'
+    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'
 -
    Template: 'qtci-windows-10-x86_64-14'
    Target os: 'Android_ANY'
@@ -90,6 +98,14 @@
    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 armeabi-v7a'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    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-macos-10.13-x86_64-2'
    Target os: 'Android_ANY'
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	7cd2473966	Update submodules on '5.14' in qt/qt5 Change-Id: I97f37b6418a58b0546b7a8b7b91229db5229a81e Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-10-03 06:12:11 +02:00
Qt Submodule Update Bot	b90dc27784	Update submodules on '5.14' in qt/qt5 Change-Id: I66ac39a88c5164d2feed7215029e621c122f90ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-10-01 06:10:51 +02:00
Qt Submodule Update Bot	1a4d0a9534	Update submodules on '5.14' in qt/qt5 Change-Id: I1a1e2430d47476de5271b9278e84f53743bdbcee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-09-30 06:26:37 +02:00
Qt Submodule Update Bot	6cb7171397	Update submodules on '5.14' in qt/qt5 Change-Id: I5575a3cf1dd9cecf5162b077e64b28eec15bcffd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-09-28 07:03:09 +02:00
Qt Submodule Update Bot	33e0c2b54f	Update submodules on '5.14' in qt/qt5 Change-Id: I79b9eeb90afc56baae339b6598dd01840d6918ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-09-27 09:20:43 +02:00
Qt Submodule Update Bot	d1a81a8e1c	Update submodules on '5.14' in qt/qt5 Change-Id: I15e5942e323d9315fc92d3a907106367f7710d09 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-09-26 06:13:53 +02:00
Qt Submodule Update Bot	ad2113fd23	Update submodules on '5.14' in qt/qt5 Change-Id: Ia3abeacaa4604fecfa0024e1db901d08510d60c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-09-25 09:23:23 +02:00
Jani Heikkinen	2cec2c5f8c	Add build for combined android targets From 5.14 -> android builds are done by default at one go. Add new builds for doing that. Removing old, separate builds will be removed in a follow-up patch to give time for packaging to adapt that new system Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>	2019-09-24 12:08:17 +03:00
Qt Submodule Update Bot	f60588ee72	Update submodules on '5.14' in qt/qt5 Change-Id: I2a4d65f7cd94f3a6ce7036f20b8a545a160434d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2019-09-24 10:57:29 +02:00