From 4175af18f8a56c8e9a372c28a8d800488f9f8a18 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 12 Aug 2019 12:43:57 +0300 Subject: Add Android x86_64 architecture It seems those build targets were accidentally deleted when yaml change was merged in. Targets were there in Qt 5.13.0 release (before yaml change) This amends a94696ccd5be936099809eda58db02999cb7c77a. See also ebcfcbe69a5d34949d938211c364e1ff6f185b39. Task-number: QTBUG-47672 Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd Reviewed-by: Liang Qi Reviewed-by: BogDan Vatra --- coin/platform_configs/qt5.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..87b2c4c1 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -42,6 +42,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-r19c -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-r19c -android-ndk-host linux-x86_64 -android-arch x86_64' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -66,6 +74,14 @@ 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' +- + 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' @@ -90,6 +106,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-r19c -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-r19c -android-ndk-host darwin-x86_64 -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' -- cgit v1.2.3 From 8d90ddd5318f6e4dcea5ebb0864a8bde94489739 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 09:30:42 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 4f116f00..3c7583fa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 +Subproject commit 3c7583fabfe327a9b1646310739845b22f94d001 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7c2ec7dc..230d6f6a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee +Subproject commit 230d6f6adc580c853cc05f484e5000703f3e42b0 diff --git a/qtscxml b/qtscxml index 1323d465..14b12a05 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1323d465b4698296533cf6c73ea5ace65dd0ce94 +Subproject commit 14b12a05efa4bd20f29ede7b729bfd5e2703358a diff --git a/qtwayland b/qtwayland index f4636b93..2b1aad5f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f4636b934f90b2a07b09f1925a86440cf1944d08 +Subproject commit 2b1aad5f86fec13bb83043ed1b08f066dd914b3d -- cgit v1.2.3 From 3277628d6282f5ecffe6fdae7fd27261de11f551 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 23:01:03 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 3c7583fa..2a4cf923 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3c7583fabfe327a9b1646310739845b22f94d001 +Subproject commit 2a4cf923f4022760f9ed0f5dc50f8b849433b3f9 diff --git a/qtdoc b/qtdoc index 03ba767b..54b8ef3d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 03ba767b36789489f46cce1ca19219dd409fbb74 +Subproject commit 54b8ef3dfd6a509007a2c92cade0cedf99756217 -- cgit v1.2.3 From b03790e34dd11bdcf7270b064a4e3711067e3c4d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Aug 2019 23:01:07 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 2a4cf923..a9b9a881 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2a4cf923f4022760f9ed0f5dc50f8b849433b3f9 +Subproject commit a9b9a881344239781e5894f2dd3d0af90ffbb4ba diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 -- cgit v1.2.3 From b959cb535901666ae0bf5307d6f60490721e7c94 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 18 Aug 2019 23:00:50 +0200 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267 Reviewed-by: Qt Submodule Update Bot --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index a6c32599..d0725820 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a6c32599a14e1c4c61f7b9c4968f8d8635f5e29c +Subproject commit d0725820c3f55aea3789489a64c63cc0b79325ff -- cgit v1.2.3 From acafe0ad49ad21652a464846c8e7b526e7058204 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Aug 2019 13:46:05 +0000 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c Reviewed-by: Jani Heikkinen --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index d0725820..e0004165 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d0725820c3f55aea3789489a64c63cc0b79325ff +Subproject commit e00041659a938b72e52c575338655264dc97b0bb -- cgit v1.2.3 From e27c7adda7862069735cb377ced43171703ee535 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Aug 2019 17:51:19 +0000 Subject: Update submodules on '5.13.1' in qt5 Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a9b9a881..7d0fff91 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a9b9a881344239781e5894f2dd3d0af90ffbb4ba +Subproject commit 7d0fff91ddadd03ff900b6d9a046a92ce6bf5a63 -- cgit v1.2.3 From 80791b03ee245b893e638a78508f1fa957f0b08d Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Sun, 1 Sep 2019 15:43:42 +0300 Subject: Update qtbase submodule on 5.13.1 in qt5 Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae Reviewed-by: Jukka Jokiniva --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 7d0fff91..af6ac444 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7d0fff91ddadd03ff900b6d9a046a92ce6bf5a63 +Subproject commit af6ac444c97ed2dc234f93fe457440c9da5482ea -- cgit v1.2.3