From d5d380f452aafd1590dff1d3bc99347bb16bd6e4 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 13 Feb 2019 09:25:22 +0200 Subject: [PATCH 01/44] Adjust submodule branches Change-Id: I309db20815d3b383155e6549b649607e956b8d89 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..8b797957 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.2 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.2 status = addon From b3b6b100e64e0f47df141b086b3cfdf550296d51 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Feb 2019 19:31:04 +0100 Subject: [PATCH 02/44] Update submodules on '5.12.2' in qt5 Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index c4e9eabc..a5cded84 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c4e9eabc309a275efc222f4127f31ba4677259b7 +Subproject commit a5cded843f495b4276a8289b1324778d97bed5ba diff --git a/qtqa b/qtqa index 0797a581..50586f55 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0797a58105d77a9c4fbb1212eb376ca487d80f81 +Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 diff --git a/qttools b/qttools index b7decf54..6c8d8363 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b7decf54170ce71811bcbc13526e31914b0498e9 +Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 diff --git a/qtwebengine b/qtwebengine index 89ebafdb..3e88b4d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 89ebafdb6c41229f007d423aa785dea6ace07271 +Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e From 9c60d8b19081e57c51d5dd4942cac6c38ace3442 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 14 Feb 2019 11:40:45 +0200 Subject: [PATCH 03/44] Fix: Set correct path to environmental variable Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen --- coin/provisioning/common/unix/install-breakpad.sh | 2 +- coin/provisioning/common/windows/install-breakpad.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh index 669469be..b05b3510 100755 --- a/coin/provisioning/common/unix/install-breakpad.sh +++ b/coin/provisioning/common/unix/install-breakpad.sh @@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad" ) -SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src" +SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome" echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 index 4a9544cc..7db6d8ac 100644 --- a/coin/provisioning/common/windows/install-breakpad.ps1 +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -87,7 +87,7 @@ catch { git checkout $linux_syscall_support_commit_sha1 } -Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad" # Write HEAD commit sha to versions txt, so build can be repeated at later date Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt From 83d5226604365756adae991c4787edaf6d6b5c6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Feb 2019 12:43:28 +0000 Subject: [PATCH 04/44] Update submodules on '5.12.2' in qt5 Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index efa4665b..b237f38e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit efa4665b316dbd5361b0936a1135f45c141f14aa +Subproject commit b237f38e89016b40861de1e0675dc2ba5b3f361a diff --git a/qtactiveqt b/qtactiveqt index 4766c93e..b918e20d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4766c93e4df91ee3ecf510b5f011799e29f6093e +Subproject commit b918e20d4c9572bfc4148aba94ac53cf811b8cce diff --git a/qtbase b/qtbase index a5cded84..0f163887 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a5cded843f495b4276a8289b1324778d97bed5ba +Subproject commit 0f163887b526d00ccdcead907dde042aa370fc16 diff --git a/qtcanvas3d b/qtcanvas3d index 18e0ed4f..f9b7e894 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 18e0ed4fecb9642464c989a6c716a2b5cf400108 +Subproject commit f9b7e894b3d91bf760d71d7d784e2d162da0569e diff --git a/qtcharts b/qtcharts index 9da68921..694cf2bb 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9da68921e4bfb9c362600832b23128d488dc7aff +Subproject commit 694cf2bb87352f99e56aa687e13fdc7eeea40720 diff --git a/qtconnectivity b/qtconnectivity index 1606ccb7..1b19d798 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1606ccb76ba72990df652fbd7f01d709ae20b63c +Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b diff --git a/qtdatavis3d b/qtdatavis3d index 54adef94..428195cb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 +Subproject commit 428195cb2b1dc0c48eb348abb856cdaabf79dc0d diff --git a/qtdeclarative b/qtdeclarative index 91a71bce..dca09f09 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 91a71bce9c633934540e9f06fb081e3b89259ff3 +Subproject commit dca09f09734fff19a3a5ad930662e0e9abd3cb1b diff --git a/qtdoc b/qtdoc index 81200196..a38799f6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81200196ada801601c6c973643d2962be5a88ba7 +Subproject commit a38799f6e165e224750494bf515c78db4c4217db diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 56a4a58c..41ab3587 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 56a4a58c999e03385bad6ab052f87ffe2c63500f +Subproject commit 41ab3587cf0847e3442da6d14253e4bec4e87837 diff --git a/qtlocation b/qtlocation index 633b0f40..6c1c24e8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 +Subproject commit 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 diff --git a/qtmultimedia b/qtmultimedia index a7f01cea..4e47d0a7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a7f01cea43a16a9b2b06ab3a8ff3b62b8edce5cd +Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe diff --git a/qtnetworkauth b/qtnetworkauth index 83633211..bd9c083b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8363321174f64a1497952d2d7fec895a2a7e18f3 +Subproject commit bd9c083ba099a46d101ca64369f46ba7fba2a943 diff --git a/qtqa b/qtqa index 50586f55..e657206a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 +Subproject commit e657206a766f0cc48fe93f79bae01739387e2291 diff --git a/qtquickcontrols b/qtquickcontrols index 65d61277..b7f5cb18 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 65d61277be164a0781f9b57873afc000f36073fa +Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 579422fa..0dfc617e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 579422faaad76b12341a725320da65fcabb3cf7b +Subproject commit 0dfc617e4d089f7513573673d12f9678a88d3081 diff --git a/qtscxml b/qtscxml index 01399f96..dca1cd7c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01399f9600174a0c77ffc57d32c07ce0698952e1 +Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 diff --git a/qtsensors b/qtsensors index 7792137f..73d5160a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7792137f3fcd400f3933e8f7f328b35aa0586f81 +Subproject commit 73d5160ab8219015a25e59c62669b2926156b807 diff --git a/qtserialport b/qtserialport index b43e8fa2..624f1754 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 +Subproject commit 624f175492660301af5eb321d2b8d6af7aa7fbc3 diff --git a/qtspeech b/qtspeech index 0711336d..f899a4c2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0711336d26804898393a99640e1442df7fd3828c +Subproject commit f899a4c2051ca4256faba2d268ca032dd129f200 diff --git a/qtsvg b/qtsvg index a91a6563..2430c9ed 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a91a65632c4d830070e1ca9bbda7e355f1459414 +Subproject commit 2430c9ed20f3f10da7bc3e7fdb5328d8501f5776 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c099fef8..277aad92 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c099fef8041f6cfd56e789b86c70a802c894da34 +Subproject commit 277aad92fb5d5612c2b952f05063518d877a5138 diff --git a/qtwebengine b/qtwebengine index 3e88b4d3..8fefc0d9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e +Subproject commit 8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632 diff --git a/qtwebsockets b/qtwebsockets index 9a0a655b..b4bac09b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9a0a655b51086045ce86c9d001d34738d84d27ff +Subproject commit b4bac09b3b2f0c3072d797b22c44e20b661c4723 diff --git a/qtx11extras b/qtx11extras index 16528689..3bfaa268 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 165286899e3426730e5dfcd155f92b571c978416 +Subproject commit 3bfaa26890990d140caba4b9a1050906c2ee546c diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e2450f4..e8026ec6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e2450f4559f03a480e37318084bab99fdc128fc +Subproject commit e8026ec6a30c5124c2e3162d9a17e9ae11fa4475 From becac559b713dfadd27198d683fde70551a543c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Feb 2019 20:33:50 +0100 Subject: [PATCH 05/44] Update submodules on '5.12.2' in qt5 Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtcharts | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index b237f38e..3de900a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b237f38e89016b40861de1e0675dc2ba5b3f361a +Subproject commit 3de900a10c6fd051ba54727be2fd1fe47ed10481 diff --git a/qtandroidextras b/qtandroidextras index 1c7de170..860fd4b9 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1c7de1701f1f75c2ce6cfff1baa6ab49ee669073 +Subproject commit 860fd4b991a9f94f07aaf45cee36bab661f3dd28 diff --git a/qtcharts b/qtcharts index 694cf2bb..c9bc2672 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 694cf2bb87352f99e56aa687e13fdc7eeea40720 +Subproject commit c9bc2672b513a414708026f4271d247feaa26471 diff --git a/qtmultimedia b/qtmultimedia index 4e47d0a7..9caf4812 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe +Subproject commit 9caf4812e073829fc961eb466f1325106f041841 diff --git a/qtpurchasing b/qtpurchasing index dff997ec..2234141c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 +Subproject commit 2234141c0ec838dd537bec909c87e8a184125f68 diff --git a/qtqa b/qtqa index e657206a..507202b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e657206a766f0cc48fe93f79bae01739387e2291 +Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af diff --git a/qtremoteobjects b/qtremoteobjects index 5f941451..1c19349a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5f94145128035bce167ca23780296564aa5f25d1 +Subproject commit 1c19349a28a75eec386b84af142fc571e492a3c3 diff --git a/qtscxml b/qtscxml index dca1cd7c..4bb7aa3f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 +Subproject commit 4bb7aa3f3002b9ba85494e5cf4808f68e0edc502 diff --git a/qtserialbus b/qtserialbus index 670f912f..745120dd 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 670f912fbc08002ac063504755fc7705931e0d6e +Subproject commit 745120ddca5fa67f1a87741e0a5c016acbd53deb diff --git a/qttools b/qttools index 6c8d8363..b0147a5d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 +Subproject commit b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8 diff --git a/qtwayland b/qtwayland index 4b58ff21..0d717b0c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4b58ff21f4a3c629867064289b6c778bbb57f95a +Subproject commit 0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb diff --git a/qtwebview b/qtwebview index 17334eb5..0aa43dc5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17334eb56b42114927169ee8eec6512754674fb2 +Subproject commit 0aa43dc555e0a820bf13a6b12671ee6a79161155 diff --git a/qtwinextras b/qtwinextras index f2dc1d1a..23dd4484 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 +Subproject commit 23dd4484915e3de89a093f8525afed1c5b8294eb From ffe8fd770183b2abc293dc356f3ac82c56143bab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Feb 2019 10:51:03 +0100 Subject: [PATCH 06/44] Update submodules on '5.12.2' in qt5 Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index dca09f09..00f283cf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dca09f09734fff19a3a5ad930662e0e9abd3cb1b +Subproject commit 00f283cf54068ec55ead07df44c424c629894749 diff --git a/qtquickcontrols b/qtquickcontrols index b7f5cb18..d641c584 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e +Subproject commit d641c584b1ed5cfae860dc0e9b08526ae6eb2c93 diff --git a/qtwebengine b/qtwebengine index 8fefc0d9..b47b28d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632 +Subproject commit b47b28d3cfb8b249cce343031507864de99117a7 From 091820f6a12f3d1932adf974406b1b62a13662ef Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 19 Feb 2019 08:48:58 +0200 Subject: [PATCH 07/44] Remove qt3d-runtime.txt symbolic link from platform configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) mode change 120000 => 100644 coin/platform_configs/qt3d-runtime.txt diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 120000 index 9b3b4cd8..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1 +0,0 @@ -qt5.txt \ No newline at end of file diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 100644 index 00000000..3de18a74 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1,22 @@ +Template Target OS Target arch Compiler Target Compiler Features +--------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From 3a1e557e5493272783d73030ac3b33cf500d459e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Feb 2019 12:45:32 +0000 Subject: [PATCH 08/44] Update submodules on '5.12.2' in qt5 Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtwebchannel | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 0f163887..e8d3306c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0f163887b526d00ccdcead907dde042aa370fc16 +Subproject commit e8d3306c8f86bf21648693521d8be91bb8f1335e diff --git a/qtconnectivity b/qtconnectivity index 1b19d798..eec8fed7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b +Subproject commit eec8fed760a572eb9187f79b43d87986f2b4f404 diff --git a/qtdeclarative b/qtdeclarative index 00f283cf..cd7ce85f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00f283cf54068ec55ead07df44c424c629894749 +Subproject commit cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f diff --git a/qtdoc b/qtdoc index a38799f6..ecc569fb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a38799f6e165e224750494bf515c78db4c4217db +Subproject commit ecc569fbcd1dc41cc08796a42752ff394826771b diff --git a/qtgamepad b/qtgamepad index 8dd9ee5e..744e13b3 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39 +Subproject commit 744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b diff --git a/qtimageformats b/qtimageformats index 0e8422be..1b8478f8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0e8422bedc8c84ff7c08c6b3163329e82c2007dd +Subproject commit 1b8478f86f15dc1dd125a2a0d8331bc3600a79c1 diff --git a/qtlocation b/qtlocation index 6c1c24e8..a00c5e40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 +Subproject commit a00c5e40a2df03713d29da83a5692f2d7c15326d diff --git a/qtmacextras b/qtmacextras index 18594a39..4509e67e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 18594a3928dbc82597cf6d9fb90ca07d2a67bcb1 +Subproject commit 4509e67e2206f9077645d5946faf7dc2f1132156 diff --git a/qtquickcontrols b/qtquickcontrols index d641c584..c231395e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d641c584b1ed5cfae860dc0e9b08526ae6eb2c93 +Subproject commit c231395eec3494619f4977b4c5cd845b9d7341ae diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0dfc617e..ca799283 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0dfc617e4d089f7513573673d12f9678a88d3081 +Subproject commit ca799283a2266b023923286b4928fdf6e7211569 diff --git a/qtscript b/qtscript index 5a9de40f..6c0edaf3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5a9de40f48f5854b6ff20329ced0f0509b81b48a +Subproject commit 6c0edaf30c5bdfc2739ca646da73dcb697ab1361 diff --git a/qtwebchannel b/qtwebchannel index d14c6aa5..45da510a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 +Subproject commit 45da510a0a87593a2ae6f98e41bb01b9d39ace58 From 7100c54887416c99d9f4f08b81e61f1bd03fda3c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 17:45:51 +0000 Subject: [PATCH 09/44] Update submodules on '5.12.2' in qt5 Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e8d3306c..856fb1ab 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e8d3306c8f86bf21648693521d8be91bb8f1335e +Subproject commit 856fb1ab44722f5165fb6b5dec0bd748006acd10 diff --git a/qtwebengine b/qtwebengine index b47b28d3..92b078a5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b47b28d3cfb8b249cce343031507864de99117a7 +Subproject commit 92b078a534390dba64a0dcebcffdab4ce24581b6 From 0660a25cca3c922346653e1bc486a0c8aa59f5aa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Feb 2019 14:00:21 +0200 Subject: [PATCH 10/44] Provisioning: Make gnuwin32 available for windows machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen Reviewed-by: Tony Sarajärvi --- .../common/windows/install-gnuwin32.ps1 | 46 +++++++++++++++++++ .../36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + 7 files changed, 58 insertions(+) create mode 100644 coin/provisioning/common/windows/install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 new file mode 100644 index 00000000..99862b3c --- /dev/null +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################ +. "$PSScriptRoot\helpers.ps1" + +# This script will install gnuwin32 + +$prog = "gnuwin32" +$zipPackage = "$prog.zip" +$temp = "$env:tmp" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage" +$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage" +Download $externalUrl $internalUrl "$temp\$zipPackage" +Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" +Extract-7Zip "$temp\$zipPackage" C:\Utils + +Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + From 7158816eedebd865bb3d840827852345729e73ff Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 17 Mar 2019 11:25:05 +0100 Subject: [PATCH 11/44] Update submodules on '5.13' in qt5 Change-Id: I9b5cfc02f045711d84084dd52e3add7baa3a0722 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index df68df84..822050ca 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit df68df8489d393a5800a0a183b6151ec0342662e +Subproject commit 822050cadf4f67f72e3b0ef108b547e8a85d6028 diff --git a/qtandroidextras b/qtandroidextras index 9aad22ed..15b2059e 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9aad22ed24537613e15f7aad760346e324a46690 +Subproject commit 15b2059e73df2f103c7206dd8d8a14a1fa3ca7b6 diff --git a/qtbase b/qtbase index eb25acc0..4554fa7b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eb25acc05b177c49eb81b190a476854fbf3c6fb1 +Subproject commit 4554fa7b191566df0a6c07e686c642c78eb88095 diff --git a/qtcharts b/qtcharts index b0650184..6a4c59bd 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b06501840033f8aa001aa13fa9abcaef921604f5 +Subproject commit 6a4c59bd9b583ffe83d131b5e5647f49672deab3 diff --git a/qtconnectivity b/qtconnectivity index b6f4d00b..bb80398c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b6f4d00b1ed8942df0832bb179de2ea331fc6755 +Subproject commit bb80398caacdae6e319cb17d4953e3800ff277f2 diff --git a/qtdatavis3d b/qtdatavis3d index 5c2043f7..4d88f5b7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 5c2043f77c31bb02a5ce7c2e0fbb8d040f395d3c +Subproject commit 4d88f5b7dacfd1f8c9f60aacd0f75b027fffbc51 diff --git a/qtdeclarative b/qtdeclarative index f10ac43e..dc3e3090 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f10ac43ebb839b61315bd3b370b77683b625e4c4 +Subproject commit dc3e3090d21339d78abc706369117b3396c843af diff --git a/qtdoc b/qtdoc index 22e2694d..14ea2e1a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 22e2694da6d960e674d3931ca3b6d9ed2c1e48e1 +Subproject commit 14ea2e1a53b92c50566a48e7eece1198fd518c63 diff --git a/qtgamepad b/qtgamepad index 604611df..e36343e5 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 604611dffd0a63558dc5a1bc40654ceb8448f19f +Subproject commit e36343e5b175bc44fc9dc3289533416b47c207e7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 6ffa20bc..44c54c6b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 6ffa20bc5fb4ee1c556ab09a15e6e2be3b011fb9 +Subproject commit 44c54c6b106c65ff21d636ce74c40fe5e602361b diff --git a/qtimageformats b/qtimageformats index 2decf5c6..45e7c2b0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2decf5c6dd3df823b385dce62b067fb5b13d399d +Subproject commit 45e7c2b0b2221d1659b480d31d4f596d5ac3f444 diff --git a/qtmacextras b/qtmacextras index 57c10f82..8eb192fe 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 57c10f82725d3468fc0027b694601300a7c169bb +Subproject commit 8eb192fe9ed2583e21450a1e567b3d461398d322 diff --git a/qtmultimedia b/qtmultimedia index 9a5bae4e..95b7fc49 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9a5bae4ed9ca10fedf842b5c293d1c0ef918c8af +Subproject commit 95b7fc4950c1f0d895896cf3086c69126d45e061 diff --git a/qtnetworkauth b/qtnetworkauth index 77f55b1d..e3a77155 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 77f55b1db58bb9941791a70185e88829cca9db6d +Subproject commit e3a77155253d40133476212713094c3bc897a938 diff --git a/qtpurchasing b/qtpurchasing index 9363738e..3402a9fd 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9363738ed780d32b40f2428ca5dfa1c919db424e +Subproject commit 3402a9fd2a98b2fa1c067b6560cb0adef507f796 diff --git a/qtquickcontrols b/qtquickcontrols index 972027ab..35e83521 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 972027abacfe3ff598db02913afdd54a72fc8633 +Subproject commit 35e83521b6a4c9efd50d498b23892b81ebbf20e7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e8b3db1b..4a434b19 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e8b3db1bedf1c62f810d26d17ce91a687448bcc4 +Subproject commit 4a434b19c347a6014f42cbcf0f1493d689e579fc diff --git a/qtrepotools b/qtrepotools index f9c6da38..a29ca613 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 +Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 diff --git a/qtscript b/qtscript index 2a106f26..32845dc7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 2a106f26d6030063be5d25726d0f4b5e6a1d50b3 +Subproject commit 32845dc708f21cd814e4a091504b2cb016de86e0 diff --git a/qtscxml b/qtscxml index 60796708..133fe954 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 60796708aad85281a519a85cdebcfab50914370f +Subproject commit 133fe95450beaba4be3db584752d80adc37d5fff diff --git a/qtsensors b/qtsensors index 1579f198..3f28dbc2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1579f19830443484c4c51d6924a5b141b4e816e4 +Subproject commit 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e diff --git a/qtserialbus b/qtserialbus index 81a50f7c..c8c0d240 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 81a50f7c45cdaa88668a953d40f67d6809b2b16a +Subproject commit c8c0d240081b1f68fad0603c5658f9314acabe2e diff --git a/qtserialport b/qtserialport index dc70c4c6..a301e0ec 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dc70c4c650b9a0ece63bb8334d1b4e7d7b09818e +Subproject commit a301e0ec1af0d888c032978fa8bcb155560ddb43 diff --git a/qtspeech b/qtspeech index f98930fc..44c23c8c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f98930fc465412d5921486ec0497bb5d5b74ae8b +Subproject commit 44c23c8c1a3a78da27e33dd6a48dc57f9876ed37 diff --git a/qtsvg b/qtsvg index 8ca3b325..82578970 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8ca3b32561b68bed3b5897e87aa912c93e9739c4 +Subproject commit 82578970d435e17738612c7bd6c1f4a9f58468cc diff --git a/qttools b/qttools index 369bbbfb..46ddc942 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 369bbbfb5aca70a7d1f8a32bd36a3d3c41721ffa +Subproject commit 46ddc9424ddd64316234194c31ac4ffad6cbab07 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3323deeb..51f7bb2d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3323deeb9915fc51b6b1044798edc2160bf78087 +Subproject commit 51f7bb2dab3737670da4fb7bc94d5b437a07fc27 diff --git a/qtwayland b/qtwayland index eabdc86b..26fccd2e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eabdc86b3a8bc1c94c917166667c3aed57f049f8 +Subproject commit 26fccd2e63ae82d1883077dfb14b7720b3c93ef1 diff --git a/qtwebengine b/qtwebengine index dc6c8d5c..31fe2e8c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dc6c8d5c9fe61ba58d065564f4d6dc0571475004 +Subproject commit 31fe2e8c1eda4a805882df79bb8cb33f06f1c799 diff --git a/qtwebsockets b/qtwebsockets index d14e55f6..da87e40e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d14e55f660d0b5e36e7d83b830c6422328a485d8 +Subproject commit da87e40ed671757bbdcd83d45018467918fd94e7 diff --git a/qtwinextras b/qtwinextras index 5c136f42..fe4c2bf0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5c136f42ea48357d0b2370f8c0b731f656ceca22 +Subproject commit fe4c2bf06610da5bb27e63dcd784e11724b06773 diff --git a/qtx11extras b/qtx11extras index e0b62282..986ea0aa 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit e0b62282231888028c520efc5fbc0667b1d9fa2c +Subproject commit 986ea0aa5ffe4d50623fedc7ab3e482aec99687a diff --git a/qtxmlpatterns b/qtxmlpatterns index 9c1abb9c..0a8a27a0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9c1abb9c6666b66fcef4ca963ba4f290695ffc90 +Subproject commit 0a8a27a0f1543423ea236a2e5ee5d851337e2481 From c71f0041719f7ab58d4a5bf1b76cd2ac681486be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Thu, 14 Mar 2019 14:02:25 -0700 Subject: [PATCH 12/44] Provisioning: add dependency walker to win10 x86 Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint Reviewed-by: Heikki Halmet --- .../qtci-windows-10-x86/09-install-dependencywalker.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..331de489 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" From 323dcdb60f041644d52e07d1235d87ff4999d3a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Mar 2019 16:14:01 +0100 Subject: [PATCH 13/44] Update submodules on '5.12' in qt5 Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 4af8fcdc..e9868e15 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4af8fcdc05d0198a569e7c39fa934614bbe31803 +Subproject commit e9868e157b56eea991e34712eace5962d14543e6 diff --git a/qtactiveqt b/qtactiveqt index 4766c93e..922903ba 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4766c93e4df91ee3ecf510b5f011799e29f6093e +Subproject commit 922903ba18bab04e81686ab9a7d8a908d9f83e46 diff --git a/qtandroidextras b/qtandroidextras index 1c7de170..bc5e209e 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1c7de1701f1f75c2ce6cfff1baa6ab49ee669073 +Subproject commit bc5e209ee2b7652684c8f4efd18b6506231dbf82 diff --git a/qtbase b/qtbase index 912bcf0f..b0145f02 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 912bcf0f0df166705f9bfd0a74ab6afcf7b42f1b +Subproject commit b0145f029cdde7ae8475b85a20099f115879496e diff --git a/qtcanvas3d b/qtcanvas3d index 18e0ed4f..9bd0368d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 18e0ed4fecb9642464c989a6c716a2b5cf400108 +Subproject commit 9bd0368d77022012a0283d8e1635204e6556c3ef diff --git a/qtcharts b/qtcharts index 203508d4..a3d050ae 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 203508d4aff39cfb7d8a7f3192884a190f203020 +Subproject commit a3d050aeca7e9c0b169938b0d27b87d005500ad4 diff --git a/qtconnectivity b/qtconnectivity index 3f9ba9c0..16f033fb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3f9ba9c07322d90f8f918d9e144e84d422e4cfbd +Subproject commit 16f033fb13a3005eefbe8b7b6ccc52bfda08649e diff --git a/qtdatavis3d b/qtdatavis3d index e91e0d04..111484f3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e91e0d04e214a372bf0c26b6f2edda1d7c47c552 +Subproject commit 111484f3e3c0ac79a7c672d66bf8bd54d711e5ca diff --git a/qtdeclarative b/qtdeclarative index c911349b..710580aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c911349b8bdcc7f798091eb6acd20395883b2000 +Subproject commit 710580aa84c5c3273e883d9e650f3159ad8250f3 diff --git a/qtdoc b/qtdoc index 323572c5..b1074519 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 323572c586c06b20a8ddccaed0add6deb9283903 +Subproject commit b107451957d8c74eb70d660d8313b4bc0dcf200b diff --git a/qtgamepad b/qtgamepad index 45feea99..9f810a34 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 45feea99efe1b28b71b649b26790616a20f20d14 +Subproject commit 9f810a34af4ad80023800b96f73e344bae7ef5bd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 23a9a049..72f39883 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 23a9a04935c28110c2cff0d71873573d8f8f51c3 +Subproject commit 72f39883c7beb7ea9bd7ccb6ecf29212cfd43e06 diff --git a/qtimageformats b/qtimageformats index 0e8422be..d83c2212 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0e8422bedc8c84ff7c08c6b3163329e82c2007dd +Subproject commit d83c22120c546dd9612d41b4acb02e489cd0d330 diff --git a/qtlocation b/qtlocation index 628cf98e..2bf874e5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 628cf98e820f552f228d6f71c770c293fce83a79 +Subproject commit 2bf874e5e2b6a08ee12d0810d67d3c7ecf1e4bfa diff --git a/qtmacextras b/qtmacextras index 18594a39..80eae30a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 18594a3928dbc82597cf6d9fb90ca07d2a67bcb1 +Subproject commit 80eae30a82bcecddc46479aa0ec08ca468bb8eac diff --git a/qtmultimedia b/qtmultimedia index 09490d1a..935967a4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 09490d1ac6294173004f8f5b948dea9a1e412d3d +Subproject commit 935967a453b47ae7c8e9ad3d94eef3813eab58db diff --git a/qtnetworkauth b/qtnetworkauth index 83633211..c03bd32d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8363321174f64a1497952d2d7fec895a2a7e18f3 +Subproject commit c03bd32dc38356b5de7f0507253c9ba901cee47c diff --git a/qtpurchasing b/qtpurchasing index 098dd780..172df3e3 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 098dd780b7e773f3e945c6e1b4b7fef51fb0a446 +Subproject commit 172df3e3c8822b3458207210b6180df22b2f3e6e diff --git a/qtqa b/qtqa index 507202b4..dc4cbd9f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af +Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 diff --git a/qtquickcontrols b/qtquickcontrols index 46425199..d601a02c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 46425199ebcdd4cb9facb471f67e17a941ca103f +Subproject commit d601a02c236314a023d5cea53d17747df6a9d84b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1ef176b5..0ee25027 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1ef176b5da8ad8d4993fa9296e64e44ee8de6560 +Subproject commit 0ee25027edf1be38412e2a397c1c0a71d2bd146b diff --git a/qtremoteobjects b/qtremoteobjects index 7dd6dda4..9ac11de4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7dd6dda47a1eec17a7193455df1087c361d975b5 +Subproject commit 9ac11de4f66ca666bbf00832c5a63691960302c4 diff --git a/qtrepotools b/qtrepotools index f9c6da38..a29ca613 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 +Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 diff --git a/qtscript b/qtscript index a122caec..19a25771 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a122caecff790a82f707894fa9db72afe91fcb7e +Subproject commit 19a2577178e7dc63d7fd6981193484f3ac160acd diff --git a/qtscxml b/qtscxml index dca1cd7c..ef4b9753 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 +Subproject commit ef4b9753f5fce47977f498c7206c98f1de3f633b diff --git a/qtsensors b/qtsensors index 7792137f..d0e95984 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7792137f3fcd400f3933e8f7f328b35aa0586f81 +Subproject commit d0e959844d60a547430cd7731d66452306561159 diff --git a/qtserialbus b/qtserialbus index 670f912f..82232b93 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 670f912fbc08002ac063504755fc7705931e0d6e +Subproject commit 82232b93711a0a747a82d1378f23a4c5db80746d diff --git a/qtserialport b/qtserialport index b43e8fa2..86c67437 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 +Subproject commit 86c674377344871ff307972f249f6383b1ee9cab diff --git a/qtspeech b/qtspeech index ca42f92a..3f956ce7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ca42f92ab22c26fbcd6b1408ef57ed5199313456 +Subproject commit 3f956ce7e7488ec88748a234ec0d8e1a8bd661ce diff --git a/qtsvg b/qtsvg index 6f152f87..a042c6ea 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6f152f87dbbd47acc58458d636ce5d1cc181b8fd +Subproject commit a042c6ea6cdf465eb47c26e11c1c929b5afe0588 diff --git a/qttools b/qttools index b4597180..c7dbb12a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b4597180191734ca128772d2b8547c6e6c08efa2 +Subproject commit c7dbb12a734b4203c3613ae3950b2e7729643d66 diff --git a/qttranslations b/qttranslations index 85e12b88..309333c0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 85e12b885e93a9f086b6a29f3cfb4a9a632013f4 +Subproject commit 309333c0d01046af1e5e8ae3cbf607eb9e081088 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eea791e1..a50ec397 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eea791e14a4e2c94ba3ac292292b76b05d56385c +Subproject commit a50ec39770c2e6c811bd65164b177f71d249f451 diff --git a/qtwayland b/qtwayland index 7206b4e8..4cba9d59 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7206b4e8b6e10f5623b19ca132f538066c96aab5 +Subproject commit 4cba9d595311ac6040bf93450d1fb09ec0a3d9f4 diff --git a/qtwebchannel b/qtwebchannel index d14c6aa5..efccc2b6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 +Subproject commit efccc2b6f12005b2d5397aef1e2822a2fc699339 diff --git a/qtwebengine b/qtwebengine index 2bf39d83..cbeef3ee 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2bf39d83a532a7fa69adc99caafaa523276b03c5 +Subproject commit cbeef3ee920576d668664ca2e0b8a55ae307959a diff --git a/qtwebsockets b/qtwebsockets index 9a0a655b..db90e6d4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9a0a655b51086045ce86c9d001d34738d84d27ff +Subproject commit db90e6d410314c33aff7031f98d178cdafdda678 diff --git a/qtwebview b/qtwebview index fc039435..ebb9acb9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fc039435b57bb5860ee3c59542d29b106071ffb5 +Subproject commit ebb9acb99b640549742c579c73e11cbcd371497c diff --git a/qtwinextras b/qtwinextras index f2dc1d1a..45bae081 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 +Subproject commit 45bae08122145a770601b3898d86532b9261b670 diff --git a/qtx11extras b/qtx11extras index 16528689..ab83a657 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 165286899e3426730e5dfcd155f92b571c978416 +Subproject commit ab83a6578cddfe9750e2df41a95c8692bdf13ed8 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e2450f4..df6fe145 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e2450f4559f03a480e37318084bab99fdc128fc +Subproject commit df6fe14535fb25305321fd278926ad2b4de3e3bb From 209b8117bd9c8ce3814a0ee70a4be476dc21eaf1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Mar 2019 14:29:14 +0100 Subject: [PATCH 14/44] Update submodules on '5.12' in qt5 Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index e9868e15..fa12f14b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e9868e157b56eea991e34712eace5962d14543e6 +Subproject commit fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 diff --git a/qtactiveqt b/qtactiveqt index 922903ba..0a091107 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 922903ba18bab04e81686ab9a7d8a908d9f83e46 +Subproject commit 0a0911079d25b529b102fb2c4ba2de2cb45b9e5d diff --git a/qtandroidextras b/qtandroidextras index bc5e209e..5e920ecf 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit bc5e209ee2b7652684c8f4efd18b6506231dbf82 +Subproject commit 5e920ecff160ddf7374023802918385ad699d786 diff --git a/qtbase b/qtbase index b0145f02..12978d4a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0145f029cdde7ae8475b85a20099f115879496e +Subproject commit 12978d4ad03af753130ba7c40b6203491cd86cd5 diff --git a/qtcanvas3d b/qtcanvas3d index 9bd0368d..ad4ac1b1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9bd0368d77022012a0283d8e1635204e6556c3ef +Subproject commit ad4ac1b1493cc637ab7280196a948fac9bef091e diff --git a/qtcharts b/qtcharts index a3d050ae..b6fe3127 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a3d050aeca7e9c0b169938b0d27b87d005500ad4 +Subproject commit b6fe3127201616fbbfd120be9c650445e583dd84 diff --git a/qtconnectivity b/qtconnectivity index 16f033fb..c488aedb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 16f033fb13a3005eefbe8b7b6ccc52bfda08649e +Subproject commit c488aedb42cda76085cfc0ed2602c34c3b5353a6 diff --git a/qtdatavis3d b/qtdatavis3d index 111484f3..c71ab9eb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 111484f3e3c0ac79a7c672d66bf8bd54d711e5ca +Subproject commit c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c diff --git a/qtdeclarative b/qtdeclarative index 710580aa..d47f0ce2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 710580aa84c5c3273e883d9e650f3159ad8250f3 +Subproject commit d47f0ce2cb6d6fb2c0d0a449d17d8c1dacbbcbe4 diff --git a/qtdoc b/qtdoc index b1074519..9c821c6d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b107451957d8c74eb70d660d8313b4bc0dcf200b +Subproject commit 9c821c6dae5a624f13d0c04e1d80aa804ed540c9 diff --git a/qtgamepad b/qtgamepad index 9f810a34..cd571466 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 9f810a34af4ad80023800b96f73e344bae7ef5bd +Subproject commit cd571466dc25674b25f34a3e2476c6a0b53dd25f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 72f39883..53d133c5 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 72f39883c7beb7ea9bd7ccb6ecf29212cfd43e06 +Subproject commit 53d133c517d8bec7e79d95cbd326cbc022d3b8c9 diff --git a/qtimageformats b/qtimageformats index d83c2212..4b0d658f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d83c22120c546dd9612d41b4acb02e489cd0d330 +Subproject commit 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a diff --git a/qtlocation b/qtlocation index 2bf874e5..6e02f895 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2bf874e5e2b6a08ee12d0810d67d3c7ecf1e4bfa +Subproject commit 6e02f895a8f3a74503971dd8df02cfafd46281f8 diff --git a/qtmacextras b/qtmacextras index 80eae30a..cc0df66a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 80eae30a82bcecddc46479aa0ec08ca468bb8eac +Subproject commit cc0df66a3e3ed4099fba96eeb287239405d49a19 diff --git a/qtmultimedia b/qtmultimedia index 935967a4..d665520e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 935967a453b47ae7c8e9ad3d94eef3813eab58db +Subproject commit d665520e8bd23121160d82cada34ff625e0d0cfe diff --git a/qtnetworkauth b/qtnetworkauth index c03bd32d..88fa9ac9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c03bd32dc38356b5de7f0507253c9ba901cee47c +Subproject commit 88fa9ac94241a182f8ad92a692eccabbc0caa9cc diff --git a/qtpurchasing b/qtpurchasing index 172df3e3..634f8e54 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 172df3e3c8822b3458207210b6180df22b2f3e6e +Subproject commit 634f8e549291b96434941b1dc29d665fdf29f980 diff --git a/qtquickcontrols b/qtquickcontrols index d601a02c..c901f6d2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d601a02c236314a023d5cea53d17747df6a9d84b +Subproject commit c901f6d2ee7f73f58881424b05d57360720fa7d9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0ee25027..27e030f2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0ee25027edf1be38412e2a397c1c0a71d2bd146b +Subproject commit 27e030f24b05dac56189c34951da38fd68dc64a1 diff --git a/qtremoteobjects b/qtremoteobjects index 9ac11de4..119b222d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9ac11de4f66ca666bbf00832c5a63691960302c4 +Subproject commit 119b222dd5ee8f4410f87c5854e6e9ee65436309 diff --git a/qtscript b/qtscript index 19a25771..6522303c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 19a2577178e7dc63d7fd6981193484f3ac160acd +Subproject commit 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b diff --git a/qtscxml b/qtscxml index ef4b9753..554ac455 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ef4b9753f5fce47977f498c7206c98f1de3f633b +Subproject commit 554ac4551c154f39de2917877b189b74e4464d3b diff --git a/qtsensors b/qtsensors index d0e95984..f5281044 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d0e959844d60a547430cd7731d66452306561159 +Subproject commit f528104474dd74e34ea6a01da096e7c31730c01a diff --git a/qtserialbus b/qtserialbus index 82232b93..4a52df0a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 82232b93711a0a747a82d1378f23a4c5db80746d +Subproject commit 4a52df0a7d5e0bc825a39d8f1f3764f45908fe75 diff --git a/qtserialport b/qtserialport index 86c67437..0ab5636a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 86c674377344871ff307972f249f6383b1ee9cab +Subproject commit 0ab5636aee10d8578307beb90c69e27f7f69574b diff --git a/qtspeech b/qtspeech index 3f956ce7..5df003ab 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 3f956ce7e7488ec88748a234ec0d8e1a8bd661ce +Subproject commit 5df003abcb564fef4074a73969d3ca3aaf8acf1d diff --git a/qtsvg b/qtsvg index a042c6ea..d477ec8f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a042c6ea6cdf465eb47c26e11c1c929b5afe0588 +Subproject commit d477ec8f40b28caf3a216d9e8550d8871d5131fb diff --git a/qttools b/qttools index c7dbb12a..44348513 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c7dbb12a734b4203c3613ae3950b2e7729643d66 +Subproject commit 44348513f90bd24674172b87a97e0c8b615a555a diff --git a/qttranslations b/qttranslations index 309333c0..7baf16d1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 309333c0d01046af1e5e8ae3cbf607eb9e081088 +Subproject commit 7baf16d13b463ed86879e8a109ff3b4ba4ae8e46 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a50ec397..21558bce 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a50ec39770c2e6c811bd65164b177f71d249f451 +Subproject commit 21558bcead96716607e670840c63213d6eb4d8c9 diff --git a/qtwayland b/qtwayland index 4cba9d59..7a0956a8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4cba9d595311ac6040bf93450d1fb09ec0a3d9f4 +Subproject commit 7a0956a89a559e5a73a659fcc08001cefa01d9bd diff --git a/qtwebchannel b/qtwebchannel index efccc2b6..05327921 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit efccc2b6f12005b2d5397aef1e2822a2fc699339 +Subproject commit 05327921fd125a6e33cb32344ac54a7b023f8c62 diff --git a/qtwebengine b/qtwebengine index cbeef3ee..3efb842b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cbeef3ee920576d668664ca2e0b8a55ae307959a +Subproject commit 3efb842be6e2c663b75f2e920fca00dd71da2ce7 diff --git a/qtwebglplugin b/qtwebglplugin index b1662da5..10a64558 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit b1662da58d05dd53b5d4c84a3518c65f417cefd8 +Subproject commit 10a64558ce927e2df0f2dfe7ff3d786d4737c06e diff --git a/qtwebsockets b/qtwebsockets index db90e6d4..dd00a38e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit db90e6d410314c33aff7031f98d178cdafdda678 +Subproject commit dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff diff --git a/qtwebview b/qtwebview index ebb9acb9..8df88a17 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ebb9acb99b640549742c579c73e11cbcd371497c +Subproject commit 8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e diff --git a/qtwinextras b/qtwinextras index 45bae081..4e5f9b48 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 45bae08122145a770601b3898d86532b9261b670 +Subproject commit 4e5f9b48b1d828bd15c32cd98d9878b0ed892dd9 diff --git a/qtx11extras b/qtx11extras index ab83a657..11ee82ab 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ab83a6578cddfe9750e2df41a95c8692bdf13ed8 +Subproject commit 11ee82ab6c256e50a39758272f1a8ca19dc8d4f3 diff --git a/qtxmlpatterns b/qtxmlpatterns index df6fe145..595e7cf5 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit df6fe14535fb25305321fd278926ad2b4de3e3bb +Subproject commit 595e7cf516be4667b41ed358eabafcbf2f23ef5c From 3003529631f697c350c5aeb4a833dc92dce84d6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Mar 2019 14:02:57 +0100 Subject: [PATCH 15/44] Update submodules on '5.13' in qt5 Change-Id: I0c15efb52ebac506133653336a16d09174bb938f Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qtbase b/qtbase index 4554fa7b..1d5f9fcc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4554fa7b191566df0a6c07e686c642c78eb88095 +Subproject commit 1d5f9fcc8a14e4826943a913fe22e819a0837b80 diff --git a/qtcharts b/qtcharts index 6a4c59bd..fc535855 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6a4c59bd9b583ffe83d131b5e5647f49672deab3 +Subproject commit fc535855c4f7e2b457b2a71fb3b687855cbfc958 diff --git a/qtconnectivity b/qtconnectivity index bb80398c..4747a72d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bb80398caacdae6e319cb17d4953e3800ff277f2 +Subproject commit 4747a72d9a69f53760793ce0c0bb0154e43eca45 diff --git a/qtdatavis3d b/qtdatavis3d index 4d88f5b7..f171e624 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4d88f5b7dacfd1f8c9f60aacd0f75b027fffbc51 +Subproject commit f171e624934ffa6d79c1eb9c9134a8ecf2101a7e diff --git a/qtdeclarative b/qtdeclarative index dc3e3090..40e149f5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dc3e3090d21339d78abc706369117b3396c843af +Subproject commit 40e149f5fa67967e890b8f9d09cbb00cb2f62259 diff --git a/qtdoc b/qtdoc index 14ea2e1a..0ead042b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 14ea2e1a53b92c50566a48e7eece1198fd518c63 +Subproject commit 0ead042bef8132544c9c5e21d4030ca3bbbc3c28 diff --git a/qtgamepad b/qtgamepad index e36343e5..846bb179 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e36343e5b175bc44fc9dc3289533416b47c207e7 +Subproject commit 846bb17980e928b4e444ce0430dfb924b73bee4b diff --git a/qtlocation b/qtlocation index 9f86b735..b5e8d016 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9f86b7353f1cdb01fe98efa8130fb6ccb5b4337d +Subproject commit b5e8d016ec819183d11307698e9e48b894321b9e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4a434b19..acebfc7f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4a434b19c347a6014f42cbcf0f1493d689e579fc +Subproject commit acebfc7f1e50386a83c1f039399cf5cf914b893e diff --git a/qtremoteobjects b/qtremoteobjects index f7921b5f..62a62403 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f7921b5f67cfe2e83d282f470128524f3fdee238 +Subproject commit 62a6240355894764c778715f6029d99c9d9e45b8 diff --git a/qttools b/qttools index 46ddc942..da6c8374 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 46ddc9424ddd64316234194c31ac4ffad6cbab07 +Subproject commit da6c83745fad37229f879d6e0b4fc74c114d5c2b diff --git a/qttranslations b/qttranslations index f74de77d..c4478f4b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f74de77d311235cebc1f0769e48aa22f420d52d4 +Subproject commit c4478f4b15b17f85f49d53de4cfb238bd791d2bf diff --git a/qtwayland b/qtwayland index 26fccd2e..c0905957 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 26fccd2e63ae82d1883077dfb14b7720b3c93ef1 +Subproject commit c0905957be0d7db90c9d9f05069a259575753dfe diff --git a/qtwebengine b/qtwebengine index 31fe2e8c..d5a479a7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 31fe2e8c1eda4a805882df79bb8cb33f06f1c799 +Subproject commit d5a479a720ee76fae9fa7b0f7b6b3d0a61718ff0 diff --git a/qtwebsockets b/qtwebsockets index da87e40e..72331822 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit da87e40ed671757bbdcd83d45018467918fd94e7 +Subproject commit 723318223fbdfda0ccc2f2fa539cf14c6ef5c92f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0a8a27a0..6ef1a201 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0a8a27a0f1543423ea236a2e5ee5d851337e2481 +Subproject commit 6ef1a201e1608ec41d71425bdb32155e002cd934 From 7cc57995bfd265a9c230d2e8c977b519de943dcc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 09:52:34 +0100 Subject: [PATCH 16/44] Update submodules on '5.12' in qt5 Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 12978d4a..4d77c375 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12978d4ad03af753130ba7c40b6203491cd86cd5 +Subproject commit 4d77c37522b51861037f0ec3ee9d4d13951672ff diff --git a/qtdeclarative b/qtdeclarative index d47f0ce2..a5b4a8db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d47f0ce2cb6d6fb2c0d0a449d17d8c1dacbbcbe4 +Subproject commit a5b4a8dbaa2f6535fa659fb95b75c059a04c6235 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 27e030f2..5a07a970 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 27e030f24b05dac56189c34951da38fd68dc64a1 +Subproject commit 5a07a970fa9d73fc2c4da8966fadcb35d142c7f5 diff --git a/qtwebengine b/qtwebengine index 3efb842b..54ac91fd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3efb842be6e2c663b75f2e920fca00dd71da2ce7 +Subproject commit 54ac91fd60ba0e84be239cefa1b56a489c420f9e From a97d669a2055b6e989e5d274da6cb14fafc66041 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 12 Mar 2019 11:31:53 +0200 Subject: [PATCH 17/44] Provisioning: Remove certificate printing to log macOS openssl provisioning printed certificates to log. This patch prevent printing certificates to log by redirecting it to /dev/null Task-number: QTQAINFRA-2841 Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74 Reviewed-by: Iikka Eklund Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/macos/install_openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh index 15f02ffd..3b1978e2 100755 --- a/coin/provisioning/common/macos/install_openssl.sh +++ b/coin/provisioning/common/macos/install_openssl.sh @@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null sudo rm -rf /tmp/openssl-$opensslVersion From 665703efc9dc150862e4f596b713ddbef5910fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 22 Mar 2019 14:06:56 +0200 Subject: [PATCH 18/44] Remove 32bit MSVC 2015 from the CI Task-number: QTQAINFRA-2251 Change-Id: I4006c7390759e2eb357309de36eb23af007a576e Reviewed-by: Tim Jenssen Reviewed-by: Alex Blasche Reviewed-by: Friedemann Kleint --- coin/platform_configs/qt5.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3de18a74..ce289290 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests From b02d849d764c794224db011fd4a746f477e31bc4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 20:55:48 +0100 Subject: [PATCH 19/44] Update submodules on '5.12' in qt5 Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 4d77c375..2f97a050 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4d77c37522b51861037f0ec3ee9d4d13951672ff +Subproject commit 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e diff --git a/qtcharts b/qtcharts index b6fe3127..c0f0d22a 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b6fe3127201616fbbfd120be9c650445e583dd84 +Subproject commit c0f0d22a1ae85c7efafb4cee6d0e59effb68262c diff --git a/qtdeclarative b/qtdeclarative index a5b4a8db..42ed40cf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a5b4a8dbaa2f6535fa659fb95b75c059a04c6235 +Subproject commit 42ed40cf0abd0155d6e6d1ef01faf9bded065588 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 53d133c5..e7ab193d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 53d133c517d8bec7e79d95cbd326cbc022d3b8c9 +Subproject commit e7ab193d855806d7333577ad7d9d15165d1b5cf8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5a07a970..5135bec5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5a07a970fa9d73fc2c4da8966fadcb35d142c7f5 +Subproject commit 5135bec50762955b3a1138ecda10214a9d0bf62a diff --git a/qttools b/qttools index 44348513..9c7502b0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 44348513f90bd24674172b87a97e0c8b615a555a +Subproject commit 9c7502b0e5056da021ace0195e53d5b7b410120b diff --git a/qtwebengine b/qtwebengine index 54ac91fd..1fe5566c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 54ac91fd60ba0e84be239cefa1b56a489c420f9e +Subproject commit 1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b From eb3c52455cd2a680ecab88105116293523bf07c9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 13:25:40 +0100 Subject: [PATCH 20/44] Update submodules on '5.13' in qt5 Change-Id: I2a21f0c7eabe7697691bbe330fd0c74058997bb1 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 1d5f9fcc..58a87609 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d5f9fcc8a14e4826943a913fe22e819a0837b80 +Subproject commit 58a87609a6c963416e2483e57e6f2a80552ec945 diff --git a/qtdeclarative b/qtdeclarative index 40e149f5..56b3232a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 40e149f5fa67967e890b8f9d09cbb00cb2f62259 +Subproject commit 56b3232a7d35fe2b856d1d87a7e1c59906b46681 diff --git a/qtdoc b/qtdoc index 0ead042b..864c88b9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0ead042bef8132544c9c5e21d4030ca3bbbc3c28 +Subproject commit 864c88b9a3ca93ebd300d7c180260087265937ef diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 44c54c6b..7d39bfe3 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 44c54c6b106c65ff21d636ce74c40fe5e602361b +Subproject commit 7d39bfe3304090ad7808a0886e249c8ecb5e06b2 diff --git a/qtlocation b/qtlocation index b5e8d016..63650309 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b5e8d016ec819183d11307698e9e48b894321b9e +Subproject commit 6365030928d3562258932647d3ade81d0a890137 diff --git a/qtwebengine b/qtwebengine index d5a479a7..f3f3279b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d5a479a720ee76fae9fa7b0f7b6b3d0a61718ff0 +Subproject commit f3f3279bec367bf3816377ac31a75c042648068f diff --git a/qtxmlpatterns b/qtxmlpatterns index 6ef1a201..ea54a864 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6ef1a201e1608ec41d71425bdb32155e002cd934 +Subproject commit ea54a86408c73340cdbfc5360209d3a01cc324c2 From 35b489b1bd2357f1ba6aba0537751ad2eb2a856c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Mar 2019 10:18:14 +0100 Subject: [PATCH 21/44] Update submodules on '5.12' in qt5 Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 2f97a050..a868942b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e +Subproject commit a868942b11a586861e167aaafaa9c65fde23e88d diff --git a/qtconnectivity b/qtconnectivity index c488aedb..d21da782 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c488aedb42cda76085cfc0ed2602c34c3b5353a6 +Subproject commit d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 diff --git a/qtdeclarative b/qtdeclarative index 42ed40cf..d8110b53 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42ed40cf0abd0155d6e6d1ef01faf9bded065588 +Subproject commit d8110b53ed9ee4d69b92e602e812c6311c1b863b diff --git a/qtimageformats b/qtimageformats index 4b0d658f..434aa248 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a +Subproject commit 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 diff --git a/qtlocation b/qtlocation index 6e02f895..5c3e3464 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6e02f895a8f3a74503971dd8df02cfafd46281f8 +Subproject commit 5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac diff --git a/qtmultimedia b/qtmultimedia index d665520e..c296df78 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d665520e8bd23121160d82cada34ff625e0d0cfe +Subproject commit c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a diff --git a/qtrepotools b/qtrepotools index a29ca613..df3090cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 +Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 diff --git a/qtserialbus b/qtserialbus index 4a52df0a..76cbf4b7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4a52df0a7d5e0bc825a39d8f1f3764f45908fe75 +Subproject commit 76cbf4b7d10db3aa8944c8480a6c504548f0e070 diff --git a/qttools b/qttools index 9c7502b0..9beac983 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9c7502b0e5056da021ace0195e53d5b7b410120b +Subproject commit 9beac9838510e94338377fcd1cfc68b371f32a86 diff --git a/qttranslations b/qttranslations index 7baf16d1..0987e6cb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7baf16d13b463ed86879e8a109ff3b4ba4ae8e46 +Subproject commit 0987e6cb7f415be17d1240c8cd71719f94a98f76 diff --git a/qtwebengine b/qtwebengine index 1fe5566c..dad0cfa3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b +Subproject commit dad0cfa3eba01b0dff698f457242f80f6eae4698 From b9e40e2fd7dc11ee3890994fc492a09f0bc705d2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Mar 2019 20:28:14 +0100 Subject: [PATCH 22/44] Update submodules on '5.12' in qt5 Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index fa12f14b..e84d8d2a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 +Subproject commit e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 diff --git a/qtbase b/qtbase index a868942b..958fa043 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a868942b11a586861e167aaafaa9c65fde23e88d +Subproject commit 958fa04327f4f3c29eb0e16cc448ef20c62e11a3 diff --git a/qtdeclarative b/qtdeclarative index d8110b53..aa51b3bf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d8110b53ed9ee4d69b92e602e812c6311c1b863b +Subproject commit aa51b3bf4ea854ffe7b39403289689daa428b221 diff --git a/qtdoc b/qtdoc index 9c821c6d..adaefd7c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9c821c6dae5a624f13d0c04e1d80aa804ed540c9 +Subproject commit adaefd7cb8ed0849cd0a36a95912e37b3b14d35a diff --git a/qtmultimedia b/qtmultimedia index c296df78..f4181938 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a +Subproject commit f41819387531a5ddfbad2e80ceec7b57a5ebb7c6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5135bec5..d0f6b286 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5135bec50762955b3a1138ecda10214a9d0bf62a +Subproject commit d0f6b28618f7252f3f7c915a6a91a153f350e354 diff --git a/qtscript b/qtscript index 6522303c..2379c9b9 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b +Subproject commit 2379c9b93792feb97d6cb871082aed0f7cbcbad8 diff --git a/qtserialbus b/qtserialbus index 76cbf4b7..d5b3a2b6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 76cbf4b7d10db3aa8944c8480a6c504548f0e070 +Subproject commit d5b3a2b6e6462f4ad46fce8f52539333b131dcad diff --git a/qttools b/qttools index 9beac983..50335cb2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9beac9838510e94338377fcd1cfc68b371f32a86 +Subproject commit 50335cb26bb88930f5e2a204642439cc9a4d2282 diff --git a/qtwebengine b/qtwebengine index dad0cfa3..1110b9b5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dad0cfa3eba01b0dff698f457242f80f6eae4698 +Subproject commit 1110b9b50e61bf2663e2037ce9e28e74a8943919 From 7eeee0df436c9b7422e91c43a89de5fdef8a102a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Mar 2019 10:41:45 +0100 Subject: [PATCH 23/44] Update submodules on '5.13' in qt5 Change-Id: I81587903b3fdf6d68c3e91d0c6d21c591e2746a3 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 822050ca..957cc79d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 822050cadf4f67f72e3b0ef108b547e8a85d6028 +Subproject commit 957cc79d4b5c36aa6b8dc99f73bd0b04b62d6898 diff --git a/qtandroidextras b/qtandroidextras index 15b2059e..be8e722b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 15b2059e73df2f103c7206dd8d8a14a1fa3ca7b6 +Subproject commit be8e722b492ec8c9c6480d68827b6ec0e83cc2d2 diff --git a/qtbase b/qtbase index 58a87609..a0446b13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 58a87609a6c963416e2483e57e6f2a80552ec945 +Subproject commit a0446b13982b8cd1c7d75df71c800c9343e8ab1e diff --git a/qtcharts b/qtcharts index fc535855..2286b0d6 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit fc535855c4f7e2b457b2a71fb3b687855cbfc958 +Subproject commit 2286b0d68cad71bd1c266070377c86ad961bf1ba diff --git a/qtconnectivity b/qtconnectivity index 4747a72d..845e185b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4747a72d9a69f53760793ce0c0bb0154e43eca45 +Subproject commit 845e185b2881210b8f3a0dc25926c3d74b0008bf diff --git a/qtdatavis3d b/qtdatavis3d index f171e624..7dc2d930 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f171e624934ffa6d79c1eb9c9134a8ecf2101a7e +Subproject commit 7dc2d9302347b87993f5cfed4be5d6b9c3e130bc diff --git a/qtdeclarative b/qtdeclarative index 56b3232a..4407f1f8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 56b3232a7d35fe2b856d1d87a7e1c59906b46681 +Subproject commit 4407f1f81813216bf64021eab7dcecc88d3056fe diff --git a/qtdoc b/qtdoc index 864c88b9..72682347 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 864c88b9a3ca93ebd300d7c180260087265937ef +Subproject commit 7268234726f41dec0615abfe651e882eef0cda48 diff --git a/qtgamepad b/qtgamepad index 846bb179..eb5cd84d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 846bb17980e928b4e444ce0430dfb924b73bee4b +Subproject commit eb5cd84d1fb2d602f2de8a7013498012b6b58d80 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7d39bfe3..085275b9 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7d39bfe3304090ad7808a0886e249c8ecb5e06b2 +Subproject commit 085275b92a55a21cbcf8d307a6f52804875deedd diff --git a/qtimageformats b/qtimageformats index 45e7c2b0..9293902f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 45e7c2b0b2221d1659b480d31d4f596d5ac3f444 +Subproject commit 9293902f325341f0c188bdf4f662c3a7d949a343 diff --git a/qtlocation b/qtlocation index 63650309..5389a65d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6365030928d3562258932647d3ade81d0a890137 +Subproject commit 5389a65dc7434c4ed269a5d0c5cb93f5b12823ba diff --git a/qtmacextras b/qtmacextras index 8eb192fe..03dd40f8 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8eb192fe9ed2583e21450a1e567b3d461398d322 +Subproject commit 03dd40f8bf0bf7cf10830a9fe04de63c0fd95e63 diff --git a/qtmultimedia b/qtmultimedia index 95b7fc49..b07a7d79 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 95b7fc4950c1f0d895896cf3086c69126d45e061 +Subproject commit b07a7d79f3080892d381c40ec79679450bda5431 diff --git a/qtnetworkauth b/qtnetworkauth index e3a77155..cf5741a4 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e3a77155253d40133476212713094c3bc897a938 +Subproject commit cf5741a44a6c337fa523080838d8e9220f4370c1 diff --git a/qtpurchasing b/qtpurchasing index 3402a9fd..12c4da76 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 3402a9fd2a98b2fa1c067b6560cb0adef507f796 +Subproject commit 12c4da762bd29399767538ca716189908e41cc5a diff --git a/qtquickcontrols b/qtquickcontrols index 35e83521..4bfe4b89 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 35e83521b6a4c9efd50d498b23892b81ebbf20e7 +Subproject commit 4bfe4b892cbbe1f1936d7caa0aac603258abc5df diff --git a/qtquickcontrols2 b/qtquickcontrols2 index acebfc7f..d9b0e2cd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit acebfc7f1e50386a83c1f039399cf5cf914b893e +Subproject commit d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 diff --git a/qtremoteobjects b/qtremoteobjects index 62a62403..09029d0c 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 62a6240355894764c778715f6029d99c9d9e45b8 +Subproject commit 09029d0c14c2101c98e038f46223595c5333f4cc diff --git a/qtrepotools b/qtrepotools index a29ca613..df3090cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 +Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 diff --git a/qtscript b/qtscript index 32845dc7..fdac5687 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 32845dc708f21cd814e4a091504b2cb016de86e0 +Subproject commit fdac568771dd146dac26cea47c83c8e2b9a1a240 diff --git a/qtscxml b/qtscxml index 133fe954..6581f591 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 133fe95450beaba4be3db584752d80adc37d5fff +Subproject commit 6581f5911eb1dec25fa4870aae8e70a58b6e8dfd diff --git a/qtsensors b/qtsensors index 3f28dbc2..27ad6151 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e +Subproject commit 27ad61518b47d34733ca18a9ad3da72a691d453d diff --git a/qtserialbus b/qtserialbus index c8c0d240..20f68cef 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8c0d240081b1f68fad0603c5658f9314acabe2e +Subproject commit 20f68cefe6d9a4c073721855053076cb63980a83 diff --git a/qtserialport b/qtserialport index a301e0ec..f47d1b9a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a301e0ec1af0d888c032978fa8bcb155560ddb43 +Subproject commit f47d1b9a11eb8c56afbd929285724f795097da09 diff --git a/qtspeech b/qtspeech index 44c23c8c..d6d6bae3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 44c23c8c1a3a78da27e33dd6a48dc57f9876ed37 +Subproject commit d6d6bae390b90ff341d08e7d4d51c4f7ccd972c2 diff --git a/qtsvg b/qtsvg index 82578970..f799d19d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 82578970d435e17738612c7bd6c1f4a9f58468cc +Subproject commit f799d19d6df12e20fc133ef8466d310427cc68ca diff --git a/qttools b/qttools index da6c8374..dea5f552 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit da6c83745fad37229f879d6e0b4fc74c114d5c2b +Subproject commit dea5f5524414e743e098151382e4d00a5b924bd1 diff --git a/qttranslations b/qttranslations index c4478f4b..8243693e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c4478f4b15b17f85f49d53de4cfb238bd791d2bf +Subproject commit 8243693e684f8b5d28ed09ffd80a6322c6134f68 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 51f7bb2d..e117cfe3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 51f7bb2dab3737670da4fb7bc94d5b437a07fc27 +Subproject commit e117cfe3be46ccb82b0b3a9674d65ffb0f49e4df diff --git a/qtwayland b/qtwayland index c0905957..59fcde2e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c0905957be0d7db90c9d9f05069a259575753dfe +Subproject commit 59fcde2e722ea6f7342ac9bf956f5f0b2911e7fd diff --git a/qtwebchannel b/qtwebchannel index 3809bdf1..6e3fb84e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3809bdf15524e65397447eb7ba62a289c5ef58d4 +Subproject commit 6e3fb84e6caa8c9bd4952bd647466469c5faf526 diff --git a/qtwebengine b/qtwebengine index f3f3279b..3fc22037 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f3f3279bec367bf3816377ac31a75c042648068f +Subproject commit 3fc220377455cb15a7e65cfc63707df552650887 diff --git a/qtwebglplugin b/qtwebglplugin index 31f06ca3..26e75b0e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 31f06ca32ebd87c5b1bad6882e2d0b4689c7e85a +Subproject commit 26e75b0e33d4480c891b669c34907ce3c0e7b5df diff --git a/qtwebsockets b/qtwebsockets index 72331822..d451e0af 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 723318223fbdfda0ccc2f2fa539cf14c6ef5c92f +Subproject commit d451e0af881365ba7524ed93e1ef3f68154c784b diff --git a/qtwebview b/qtwebview index cd0cb72a..f625019a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cd0cb72a2cd219af5faade928c06b61df715b14b +Subproject commit f625019aef6dd336ead142d61ed480469c8711ee diff --git a/qtwinextras b/qtwinextras index fe4c2bf0..49d744be 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fe4c2bf06610da5bb27e63dcd784e11724b06773 +Subproject commit 49d744be877b2a4cba3e306c4ab0056687179318 diff --git a/qtx11extras b/qtx11extras index 986ea0aa..431bd11f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 986ea0aa5ffe4d50623fedc7ab3e482aec99687a +Subproject commit 431bd11f304179c77f55edd07d68b02d8408a45c diff --git a/qtxmlpatterns b/qtxmlpatterns index ea54a864..c886d992 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ea54a86408c73340cdbfc5360209d3a01cc324c2 +Subproject commit c886d992029740da0185fd2bf8a040c84156e73d From c09135cb56e03dd6a09b79f2c6e15932e9433df2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Jan 2019 15:24:27 +0200 Subject: [PATCH 24/44] Provisioning: Update Android NDK to version r19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/windows/android.ps1 | 10 +++++----- .../provisioning/qtci-macos-10.13-x86_64/30-android.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..97df7e57 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,14 +51,14 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" +ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" From f678ae3769e69ffc3afbd2f45ef60c92e4db5f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 09:46:17 +0200 Subject: [PATCH 25/44] Fix soft links and file modes of a few macOS provisioning scripts Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../01-sha1sum-compatibility.sh | 42 ++++++++++++++++++- .../qtci-macos-10.12-x86_64/02-disable-ntp.sh | 0 .../01-sha1sum-compatibility.sh | 19 +++------ .../35-install-breakpad.sh | 0 4 files changed, 46 insertions(+), 15 deletions(-) mode change 120000 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh deleted file mode 120000 index 58a40af4..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh +++ /dev/null @@ -1 +0,0 @@ -../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh new file mode 100755 index 00000000..52650fea --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh index c3936499..52650fea 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh @@ -33,18 +33,9 @@ ## ############################################################################# -# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'. -# In order to make all unix provioning scripts run on macOS without special case handling -# a symbolic link is created. -# The shasum tool is a perl script which does some globbing to determine the perl version. The -# symbolic link has to point directly to the binary including the perl version. -# Additionally the CI seems to have multiple parallel perl versions installed which causes -# multiple shasum tools to be present (shasum5.16, shasum5.18). -# -# Currently this is -# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18 +#!/usr/bin/env bash -[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin -# shellcheck disable=SC2012 -SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1) -sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 From b2afcc84055a7d1fe8c8ede56961d52e19782a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 13:01:21 +0200 Subject: [PATCH 26/44] Fix shellcheck complaints from provisioning scripts Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 5 +++-- .../qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh | 3 +++ .../qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../35-install-breakpad.sh | 0 .../qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 4 +++- .../04-yocto_ssh_configurations.sh | 1 + .../10-openssl_for_android_linux.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh | 3 +++ .../qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/99-version.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 3 ++- .../qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh | 1 + .../qtci-macos-10.12-x86_64/02-disable-ntp.sh | 4 +++- .../qtci-macos-10.12-x86_64/06-disable_spotlight.sh | 5 ++++- coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh | 4 +++- .../21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh | 2 +- .../qtci-macos-10.12-x86_64/25-homebrew.sh | 2 +- .../provisioning/qtci-macos-10.12-x86_64/25-python2.sh | 1 + .../provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh | 2 +- .../qtci-macos-10.12-x86_64/26-virtualenv.sh | 2 +- .../qtci-macos-10.12-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 2 +- .../provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 1 + .../qtci-macos-10.12-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh | 6 ++++-- .../qtci-macos-10.13-x86_64/02-disable-ntp.sh | 3 ++- .../qtci-macos-10.13-x86_64/06-disable_spotlight.sh | 5 ++++- coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh | 4 +++- .../21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh | 2 +- .../qtci-macos-10.13-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh | 2 +- .../provisioning/qtci-macos-10.13-x86_64/25-python2.sh | 1 + .../provisioning/qtci-macos-10.13-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh | 2 +- .../qtci-macos-10.13-x86_64/26-virtualenv.sh | 2 +- .../qtci-macos-10.13-x86_64/27-libclang.sh | 2 +- .../provisioning/qtci-macos-10.13-x86_64/30-android.sh | 5 ----- coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh | 2 +- .../provisioning/qtci-macos-10.13-x86_64/35-openssl.sh | 1 + .../qtci-macos-10.13-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh | 6 ++++-- 60 files changed, 95 insertions(+), 52 deletions(-) mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index addfb673..e86870c0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -124,7 +124,8 @@ sudo pip install virtualenv wheel sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory -/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 938ef37c..b917d292 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -37,6 +37,7 @@ set -ex +# shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 4559151e..f2eb6e60 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -45,7 +45,7 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) -for i in `seq 10`; do +for i in $(seq 10); do echo attempting to remove aptdaemon sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true # check that aptdaemon is no longer installed @@ -178,7 +178,8 @@ echo "Installing packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh index ca31a876..89806892 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh index c2331d16..96b197ea 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh @@ -33,4 +33,7 @@ ## ############################################################################# +set -ex + +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh index ca24a70e..d8df4375 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/fbx_linux.sh +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh index 6784335a..0527fe85 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/android_linux.sh source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh index 8f81a7dd..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/cmake_linux.sh +"$BASEDIR/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh index 37aec494..4034162e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index c4740556..a2d162d3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_700.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh index 4a6681f3..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/docker.sh +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh index 27ff15c3..e4281588 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 1d567a3e..dae1a58e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,7 +168,7 @@ waitLoop sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index e3faa20e..4ca84072 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -34,6 +34,7 @@ set -ex +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # build latest qemu to usermode diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index fbe669d9..1c856c0c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -37,7 +37,9 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." @@ -76,7 +78,7 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh index e4d988fc..a6aa3b10 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh index 0f89e72c..81ea3b17 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/openssl_for_android_linux.sh source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh index 4527e984..7c58c478 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -33,4 +33,7 @@ ## ############################################################################# +set -ex + +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh index 1a185223..4dd1d40e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh index 24ac2ac0..1d7a3968 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_700.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh index 4a6681f3..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/docker.sh +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh index 43790efd..fcc7d31c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -1,3 +1,4 @@ #!/bin/bash +# shellcheck source=../common/linux/squish-coco.sh source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh index b062800a..c8f3ac03 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/ubuntu-version.sh +"$BASEDIR/../common/linux/ubuntu-version.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 208762d3..6c5d2a0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh index ecce5ae7..09a76778 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/emsdk.sh source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh index 32528873..3304cc3e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex -$(dirname $0)/../common/unix/disable-ntp_macos.sh +# shellcheck source=../common/unix/disable-ntp_macos.sh +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh index d991e6c0..67e2c1f6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash -$(dirname "$0")/../common/macos/disable_spotlight.sh +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index 6d3a2bb5..6e47f6a5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -39,7 +39,7 @@ set -ex -# shellcheck source=../common/macos/InstallPKGFromURL +# shellcheck source=../common/macos/InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 8877c40b..dcfcb93b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index f7aba0dc..1fa8b05d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="9.2" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh index e5dd1910..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh index 0ead5a58..06e984ec 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh index ef65edad..7ebb8825 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python2.sh source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh index 92b05bf3..eb2a4863 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python3.sh source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh index 469901b5..2aedfe7b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/libiodbc.sh +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh index a35d26ca..eaabce82 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/virtualenv.sh +"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index d68bf90a..33795b08 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package -$BASEDIR/../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh index 9ce5d9ff..34eefeb6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/fbx_macos.sh +"$BASEDIR/../common/macos/fbx_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 36bcf53c..963f48d6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -2,4 +2,5 @@ set -ex +# shellcheck source=../common/macos/install_openssl.sh source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index e1a41835..5bc77ad3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt") +loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt") loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." @@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") +DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") echo "Unlocking $devIDKeychain with password.." security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain @@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios -iosPassword=$(<"$targetFolder/ios_password.txt") +iosPassword=$(cat "$targetFolder/ios_password.txt") iPhoneDeveloper="iosdevelopment.p12" shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign iPhoneDistribution="iosdistribution.p12" shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh index 27ff15c3..17a0c38e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh index 32528873..64d43d83 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash -$(dirname $0)/../common/unix/disable-ntp_macos.sh +# shellcheck source=../common/unix/disable-ntp_macos.sh +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh index d991e6c0..67e2c1f6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash -$(dirname "$0")/../common/macos/disable_spotlight.sh +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh index 06437ee1..9a667c64 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh @@ -39,7 +39,7 @@ set -ex -# shellcheck source=../common/macos/InstallPKGFromURL +# shellcheck source=../common/macos/InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh index 8877c40b..dcfcb93b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh index f7c251b1..d4708031 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="10.1" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh index e5dd1910..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh index 0ead5a58..06e984ec 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh index 69c6b318..86db3e27 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/pip.sh +"$BASEDIR/../common/macos/pip.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh index ef65edad..7ebb8825 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python2.sh source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh index 92b05bf3..eb2a4863 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python3.sh source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh index 469901b5..2aedfe7b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/libiodbc.sh +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh index a35d26ca..eaabce82 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/virtualenv.sh +"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh index fea11e01..aad628cb 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..c0d75ff6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" -toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" - -toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -ndkTargetFile="/tmp/$ndkFile" ndkSourceFile="$basePath/$ndkFile" echo "Unzipping Android NDK to '$targetFolder'" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh index 9ce5d9ff..34eefeb6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/fbx_macos.sh +"$BASEDIR/../common/macos/fbx_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 36bcf53c..963f48d6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -2,4 +2,5 @@ set -ex +# shellcheck source=../common/macos/install_openssl.sh source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index d9caff91..0b8595a0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null +{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." @@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null +{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null echo "Unlocking $devIDKeychain with password.." { security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null @@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null +{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null iPhoneDeveloper="iosdevelopment_2019.p12" shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null +{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null iPhoneDistribution="iosdistribution_2019.p12" shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null +{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh index 27ff15c3..17a0c38e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" From 8630f18d1e2f072338da3d6196f90de690be95b3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 5 Apr 2019 07:03:27 +0200 Subject: [PATCH 27/44] Only update qtwebengine in this round Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 3fc22037..320c7316 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3fc220377455cb15a7e65cfc63707df552650887 +Subproject commit 320c7316b75be22112cb4802187c3873c9934eab From c654e63c87d83577116431e165115e0c6ceb723d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 7 Sep 2018 09:17:02 +0300 Subject: [PATCH 28/44] Update Windows 10, MSVC 2015 and MSVC 2017 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 updated to build 1809 msvc2015 update 3 14.0.25431.01 msvc2015 update 3 (KB3165756) msvc2017 5.18.2 4.7.03056 ms-zune is no longer available in the latest Windows 10 version dotnet and msvc 2015 update patch installation moved to pre-provisioning. Msvc 2015 update patch installation seems to be flaky with this windows version. Task-number: QTBUG-68190 Task-number: QTQAINFRA-2255 Task-number: QTBUG-71125 Change-Id: I87defffa488cb75f7de0909020073b35476bea80 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 12 ++-- coin/platform_configs/qt3d-runtime.txt | 23 ++++++- coin/platform_configs/qt5.txt | 24 +++---- coin/platform_configs/qtbase.txt | 3 +- coin/platform_configs/qtconnectivity.txt | 2 +- coin/platform_configs/qtwebkit.txt | 2 +- .../06-msvc_2017_build_tools.ps1 | 2 +- .../qtci-windows-10-x86/msvc2015_update.ps1 | 2 +- .../qtci-windows-10-x86/msvc2017.ps1 | 2 +- .../01-enable-dotnet-framework.ps1 | 0 .../06-msvc_2017_build_tools.ps1 | 48 -------------- .../msvc2015_update.ps1 | 39 +++++------ .../qtci-windows-10-x86_64/msvc2017.ps1 | 64 +++++++++++++++---- .../msvc_2015_update3_patch.ps1 | 0 .../01-remove-ms-zune.ps1 | 2 - .../qtci-windows-10-x86_64/05-msvc.ps1 | 4 +- .../10-msvc_2015_update3_patch.ps1 | 34 ---------- 17 files changed, 115 insertions(+), 148 deletions(-) mode change 120000 => 100644 coin/platform_configs/qt3d-runtime.txt rename coin/{provisioning => pre-provisioning}/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 (100%) delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 rename coin/{provisioning/common/windows => pre-provisioning/qtci-windows-10-x86_64}/msvc_2015_update3_patch.ps1 (100%) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 14f89e80..54aa1156 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,12 +1,12 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle +qtci-windows-10-x86_64-14 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 120000 index 9b3b4cd8..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1 +0,0 @@ -qt5.txt \ No newline at end of file diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 100644 index 00000000..0072dfe3 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1,22 @@ +Template Target OS Target arch Compiler Target Compiler Features +--------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3de18a74..0072dfe3 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,22 +1,22 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index edaf168f..e8e10354 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -2,6 +2,5 @@ Template Target OS Target arch Compiler Fe --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 4ac73c86..15f11bd1 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index a357ad5b..27782f88 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 index 0c00ba71..2bb92c22 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 index 2ad479c8..35f8dc3f 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index cf00ee88..052ec9c6 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 deleted file mode 100644 index 0c00ba71..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 Build Tools -# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 - -$version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" -$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" -$msvcPackage = "C:\Windows\Temp\$version.exe" - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --passive --wait" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio Build Tools = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 2ad479c8..00f8af72 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,29 +30,22 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" -# Install Visual Studio $version with $update_version -# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs -$version = "2015" -$update_version = "3" +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25431.01" +$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978" -# Only way to install specific Visual studio release is to use feed.xml. -# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' -# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) -$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" +# default plus following components were selected: +# * Visual C++ +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 -$msvc_web_installer = "vs" + $version + "_" + $update_version -$package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" -$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" -$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" -echo "Fetching Visual Studio $version update $update_version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing Visual studio $version update $update_version..." -cmd /c "$package $parameters /norestart /Quiet" -remove-item $package - -echo "Visual Studio = $version update $update_version" >> ~\versions.txt +echo "Visual Studio = $version version $version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index cf00ee88..cc0dbd85 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,19 +31,57 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 +# Visual Studio $version version $version_number was installed manually using $installer. $version = "2017" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" -$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" -$msvcPackage = "C:\Windows\Temp\$version.exe" +$version_number = "15.8.5" +$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" +# Following components were selected from installer: +# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack) +# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK) +# Microsoft.Component.NetFX.Native (.NET Native) +# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack) +# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server) +# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references) +# Microsoft.Component.ClickOnce (ClickOnce Publishing) +# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools) +# Microsoft.VisualStudio.Component.NuGet (NuGet package manager) +# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools) +# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation) +# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers) +# Microsoft.Component.MSBuild (MSBuild) +# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools) +# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update) +# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM) +# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64) +# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake) +# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools) +# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools) +# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics) +# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger) +# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic) +# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support) +# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services) +# Component.Linux.CMake (Visual C++ tools for CMake and Linux) +# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features) +# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX) +# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors) +# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK) +# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK) +# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK) +# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64) +# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64]) +# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0)) -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio = $version" >> ~\versions.txt +echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 similarity index 100% rename from coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 deleted file mode 100644 index 6a398725..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe -Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index d019fc92..72ac1ca7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt # MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt # MSVC 2017 Build Tools Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - From 16201ab31d283b08dcf801a8f6068f402cd489f5 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 19 Mar 2019 09:48:01 +0100 Subject: [PATCH 29/44] Deprecate QtXmlPattern module Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304 Reviewed-by: Lars Knoll --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index acfa2616..2f6addc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,7 +49,7 @@ path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.13 - status = addon + status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations From 338fce191ac1e14b9365068021b4f7ec7ad50646 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 5 Apr 2019 10:12:36 +0200 Subject: [PATCH 30/44] Provisioning: Install i686 mingw on Windows 10 X64 Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-mingw.ps1 | 5 +++-- .../qtci-windows-10-x86_64/09-install-mingw730.ps1 | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 8b7fe41d..bc05ba91 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -37,7 +37,8 @@ function InstallMinGW { Param ( [string] $release = $(BadParam("release file name")), - [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + [string] $sha1 = $(BadParam("SHA1 checksum of the file")), + [string] $suffix = "" ) $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') @@ -45,7 +46,7 @@ function InstallMinGW if ($arch -eq "i686") { $win_arch = "Win32" } elseif ($arch -eq "x86_64") { $win_arch = "Win64" } - $envvar = "MINGW$version" + $envvar = "MINGW$version$suffix" $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 new file mode 100644 index 00000000..5401b36a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 7.3.0 + +$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0" +$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + From 261cc1bd8ffcb14fffaf4d8ecc77e4c50c5dae17 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Apr 2019 17:22:29 +0200 Subject: [PATCH 31/44] Update submodules on '5.12' in qt5 Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index e84d8d2a..985a6192 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 +Subproject commit 985a61921fbcb893b89b8dde6eeaab5cf8c5dc1c diff --git a/qtbase b/qtbase index 958fa043..01a26959 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 958fa04327f4f3c29eb0e16cc448ef20c62e11a3 +Subproject commit 01a269593d281ae1cacc9cef5c5ccae10d41f03e diff --git a/qtconnectivity b/qtconnectivity index d21da782..6257ca58 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 +Subproject commit 6257ca589f435ea9b4f73067098ab54bbc873faf diff --git a/qtdeclarative b/qtdeclarative index aa51b3bf..651177db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aa51b3bf4ea854ffe7b39403289689daa428b221 +Subproject commit 651177db69a61278da5bc1b2434b8e7f291d5636 diff --git a/qtdoc b/qtdoc index adaefd7c..7f427f73 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit adaefd7cb8ed0849cd0a36a95912e37b3b14d35a +Subproject commit 7f427f737798d1454ba92277f38a2783ce1b2cd0 diff --git a/qtimageformats b/qtimageformats index 434aa248..b1d12f8c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 +Subproject commit b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 diff --git a/qtmultimedia b/qtmultimedia index f4181938..3f8b0a91 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f41819387531a5ddfbad2e80ceec7b57a5ebb7c6 +Subproject commit 3f8b0a916e9e0ca4e17900e1399ee8ad6bbf35b8 diff --git a/qtqa b/qtqa index dc4cbd9f..f6ae7d57 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 +Subproject commit f6ae7d57052527d358f839e60847a2a2e28df038 diff --git a/qtquickcontrols b/qtquickcontrols index c901f6d2..1edf84ef 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c901f6d2ee7f73f58881424b05d57360720fa7d9 +Subproject commit 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d0f6b286..f5f36b0d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d0f6b28618f7252f3f7c915a6a91a153f350e354 +Subproject commit f5f36b0db64e77822ef3053245c993ed14949192 diff --git a/qttools b/qttools index 50335cb2..844d7582 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 50335cb26bb88930f5e2a204642439cc9a4d2282 +Subproject commit 844d7582dc73ec0ec11f939cc1cf9e4abb4786e8 diff --git a/qtwayland b/qtwayland index 7a0956a8..5405de12 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7a0956a89a559e5a73a659fcc08001cefa01d9bd +Subproject commit 5405de120bba480f780e37e90fbd7c2ff1308b01 diff --git a/qtwebengine b/qtwebengine index 1110b9b5..2b623019 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1110b9b50e61bf2663e2037ce9e28e74a8943919 +Subproject commit 2b623019de45daba51ae31d16e4b05e3c30adbc3 From b3e35cbac501c749cd17a48c8fc85ef6f8acbba7 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Apr 2019 09:13:26 +0300 Subject: [PATCH 32/44] Provisioning: Remove MSVC 2015 update 3 patch from provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi --- .../10-msvc_2015_update3_patch.ps1 | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - From 6db224cfc70c2b9b45a39c3e340cd327cc1b8723 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Apr 2019 20:24:06 +0200 Subject: [PATCH 33/44] Update submodules on '5.12' in qt5 Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 985a6192..00992700 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 985a61921fbcb893b89b8dde6eeaab5cf8c5dc1c +Subproject commit 0099270008fa1d218fb5ed38028e6e27ca811bb1 diff --git a/qtbase b/qtbase index 01a26959..6d4a456a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 01a269593d281ae1cacc9cef5c5ccae10d41f03e +Subproject commit 6d4a456a28282973d2501e0b16f09cafb316bb0a diff --git a/qtdeclarative b/qtdeclarative index 651177db..936cc8ad 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 651177db69a61278da5bc1b2434b8e7f291d5636 +Subproject commit 936cc8adccecfdd32966bd9c1ff7a9f534a027fe diff --git a/qtmultimedia b/qtmultimedia index 3f8b0a91..c785e8fc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3f8b0a916e9e0ca4e17900e1399ee8ad6bbf35b8 +Subproject commit c785e8fcfd0202a88a5e28f8a1410a83f95a9c9f diff --git a/qtqa b/qtqa index f6ae7d57..8c9be4c8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f6ae7d57052527d358f839e60847a2a2e28df038 +Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 diff --git a/qtwebengine b/qtwebengine index 2b623019..44303861 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2b623019de45daba51ae31d16e4b05e3c30adbc3 +Subproject commit 44303861fd116b3a279d26300147e89a0bf8121c From 791ec923a799a7cdba0b926412aa9fedb4bdc983 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 26 Feb 2019 13:12:02 +0200 Subject: [PATCH 34/44] Provisioning: Echo Emscripten version information to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4 Reviewed-by: Juha Karjalainen Reviewed-by: Morten Johan Sørvig Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/emsdk.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 284eb19d..55f5a8c9 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -76,3 +76,6 @@ EOM SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" + +echo "Emsdk = $version" >> ~/versions.txt +echo "Emsdk node = $version_node" >> ~/versions.txt From 314db90904d673125d1ddbbd927a1577855809c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Apr 2019 04:20:30 +0000 Subject: [PATCH 35/44] Update submodules on '5.13' in qt5 Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qt3d b/qt3d index 6f7ac292..276be935 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6f7ac29268df048b5f23ad26c47efcbfdfdb3585 +Subproject commit 276be935bfeccde733bacd4267abeb978f6efda5 diff --git a/qtbase b/qtbase index a0446b13..eaf20420 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0446b13982b8cd1c7d75df71c800c9343e8ab1e +Subproject commit eaf20420f8a4d72c804a9d3725c3e294b34c78c8 diff --git a/qtcharts b/qtcharts index 2286b0d6..be2280a9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2286b0d68cad71bd1c266070377c86ad961bf1ba +Subproject commit be2280a9600430d55595742ec75c08bb1556ec9b diff --git a/qtconnectivity b/qtconnectivity index 845e185b..d1d8feec 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 845e185b2881210b8f3a0dc25926c3d74b0008bf +Subproject commit d1d8feec751abdf872c4f13e0253202f87c19d1a diff --git a/qtdeclarative b/qtdeclarative index 4407f1f8..8c3172d7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4407f1f81813216bf64021eab7dcecc88d3056fe +Subproject commit 8c3172d724f3ad03cdee7bae23443fa109d350b1 diff --git a/qtdoc b/qtdoc index 72682347..2d021dd9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7268234726f41dec0615abfe651e882eef0cda48 +Subproject commit 2d021dd91a018f18faf56647319510afb8f7e292 diff --git a/qtimageformats b/qtimageformats index 9293902f..86872a18 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9293902f325341f0c188bdf4f662c3a7d949a343 +Subproject commit 86872a1846ce622bb5f305a75a20939ac145122f diff --git a/qtlocation b/qtlocation index 5389a65d..01dca9ef 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5389a65dc7434c4ed269a5d0c5cb93f5b12823ba +Subproject commit 01dca9ef9887109be8dfc550f8fa881e208535bf diff --git a/qtmultimedia b/qtmultimedia index b07a7d79..f787689e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b07a7d79f3080892d381c40ec79679450bda5431 +Subproject commit f787689e74dee63c55f2731683a4ede752fd9e44 diff --git a/qtqa b/qtqa index dc4cbd9f..8c9be4c8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 +Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 diff --git a/qtquickcontrols b/qtquickcontrols index 4bfe4b89..3d444423 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4bfe4b892cbbe1f1936d7caa0aac603258abc5df +Subproject commit 3d44442331ba6f1ba7a5d5ad9f3834993911e288 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d9b0e2cd..90018127 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 +Subproject commit 9001812730bccd4ee5153ad47aa130b230c27d78 diff --git a/qtremoteobjects b/qtremoteobjects index 09029d0c..cb9a20c5 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 09029d0c14c2101c98e038f46223595c5333f4cc +Subproject commit cb9a20c50584eaf950c1fc9a7fd7961a92100046 diff --git a/qtscript b/qtscript index fdac5687..8d2c11ac 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit fdac568771dd146dac26cea47c83c8e2b9a1a240 +Subproject commit 8d2c11ac2352556167dc4a86172cd9bc3a979ed8 diff --git a/qtserialbus b/qtserialbus index 20f68cef..3df07ae0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 20f68cefe6d9a4c073721855053076cb63980a83 +Subproject commit 3df07ae0b98dabbc2b60bab162173b24b010a4ee diff --git a/qtspeech b/qtspeech index d6d6bae3..c79b11cb 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d6d6bae390b90ff341d08e7d4d51c4f7ccd972c2 +Subproject commit c79b11cbf4eb6e72d32eb98a262201341018b620 diff --git a/qttools b/qttools index dea5f552..66743ae9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dea5f5524414e743e098151382e4d00a5b924bd1 +Subproject commit 66743ae97387da43dc6f27e5237ec472edae35f5 diff --git a/qtwayland b/qtwayland index 59fcde2e..0b10284a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 59fcde2e722ea6f7342ac9bf956f5f0b2911e7fd +Subproject commit 0b10284a3589b37a9d639f3d1af4b1d641fbb6ab diff --git a/qtwebchannel b/qtwebchannel index 6e3fb84e..f5f5eea1 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6e3fb84e6caa8c9bd4952bd647466469c5faf526 +Subproject commit f5f5eea1e204642c25360106825a92a9336584b4 diff --git a/qtwebengine b/qtwebengine index 320c7316..64a2e6ff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 320c7316b75be22112cb4802187c3873c9934eab +Subproject commit 64a2e6ff1cb9c169f251ee5983c27156b27a0470 diff --git a/qtwebglplugin b/qtwebglplugin index 26e75b0e..c21dbf12 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 26e75b0e33d4480c891b669c34907ce3c0e7b5df +Subproject commit c21dbf122e57ee90436de65a7f868fd8ce5a377b From 403d4e1d969d4ad079935061e7b6937352b474ed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Apr 2019 22:31:05 +0200 Subject: [PATCH 36/44] Update submodules on '5.13' in qt5 Change-Id: I1e38740b9e4f4c9570d02d5b131def095418778f Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index eaf20420..63e88f60 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eaf20420f8a4d72c804a9d3725c3e294b34c78c8 +Subproject commit 63e88f60a769f2535945db0e1cabb9815ff45a77 diff --git a/qtconnectivity b/qtconnectivity index d1d8feec..1fdbe1c6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d1d8feec751abdf872c4f13e0253202f87c19d1a +Subproject commit 1fdbe1c6a9b818b5928537f176fcf026b31e17a2 diff --git a/qtdeclarative b/qtdeclarative index 8c3172d7..75998b22 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8c3172d724f3ad03cdee7bae23443fa109d350b1 +Subproject commit 75998b22b0b216d925e93d2c0e205025c23b2522 diff --git a/qtdoc b/qtdoc index 2d021dd9..256e0b4a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2d021dd91a018f18faf56647319510afb8f7e292 +Subproject commit 256e0b4ab4181cc0eb3a8ddde4d464b98e6be16a diff --git a/qtlocation b/qtlocation index 01dca9ef..394f7a1d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 01dca9ef9887109be8dfc550f8fa881e208535bf +Subproject commit 394f7a1dc772d2dfa1a65b456e623b7d09d0d482 diff --git a/qtmultimedia b/qtmultimedia index f787689e..82fdc891 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f787689e74dee63c55f2731683a4ede752fd9e44 +Subproject commit 82fdc8913483dd352ae2c326dd358fe9ff8f3f66 diff --git a/qtwebengine b/qtwebengine index 64a2e6ff..43eb77cb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 64a2e6ff1cb9c169f251ee5983c27156b27a0470 +Subproject commit 43eb77cb0d93020ce7db27fa2ac8dc7ef7738709 From d2697103835ef7a951d847ada13ccd522f5f9df8 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 3 Apr 2019 14:47:29 +0300 Subject: [PATCH 37/44] Change linux webasembly build from devoloper build to release build Change-Id: Ic2481d69b69e6bc50d583adf5e1d2857abc6ec25 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 54aa1156..29a20a07 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,7 +11,7 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch From 48443b4b9a8009b51728e020454e189d8c995acf Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Mon, 8 Apr 2019 12:54:40 +0300 Subject: [PATCH 38/44] Provisioning: update python 2.7.14 to 2.7.16 Python 2.7.14 used tlsv1 which is no longer accepted by github thus needing update to newer version. Task-number: QTQAINFRA-2900 Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/python2.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index f4016f8d..4ab914de 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" -SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg" +SHA1="895a8327a58e7c0e58852638ab3d84843643535b" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" @@ -55,5 +55,5 @@ InstallPip python2.7 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" -echo "python2 = 2.7.14" >> ~/versions.txt +echo "python2 = 2.7.16" >> ~/versions.txt From 21a6541aebfa90e78510460393636826391b54d7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Apr 2019 07:51:43 +0200 Subject: [PATCH 39/44] Update submodules on '5.12' in qt5 Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebview | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 00992700..1fcdee0f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0099270008fa1d218fb5ed38028e6e27ca811bb1 +Subproject commit 1fcdee0f313845f4e06b294cf520ab477191774b diff --git a/qtbase b/qtbase index 6d4a456a..73698cb3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6d4a456a28282973d2501e0b16f09cafb316bb0a +Subproject commit 73698cb3401b9445ba0ad6b0a6cc3e125e50a745 diff --git a/qtconnectivity b/qtconnectivity index 6257ca58..8b643c80 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6257ca589f435ea9b4f73067098ab54bbc873faf +Subproject commit 8b643c80a81f4897e0a1ec6442820c60bbc802b1 diff --git a/qtdeclarative b/qtdeclarative index 936cc8ad..b2fd2b66 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 936cc8adccecfdd32966bd9c1ff7a9f534a027fe +Subproject commit b2fd2b664212344eb82b44f916c849314d5e02fb diff --git a/qtgamepad b/qtgamepad index cd571466..8ecbb722 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit cd571466dc25674b25f34a3e2476c6a0b53dd25f +Subproject commit 8ecbb7227b5bf2da6887e5a4ec0c7c7012affb6e diff --git a/qtmultimedia b/qtmultimedia index c785e8fc..c8716f68 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c785e8fcfd0202a88a5e28f8a1410a83f95a9c9f +Subproject commit c8716f68feb5a38473cbd54972b9a9f095e9e24d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f5f36b0d..bd126fde 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f5f36b0db64e77822ef3053245c993ed14949192 +Subproject commit bd126fdea95ed994fdd35d50e445b45af75657ab diff --git a/qttools b/qttools index 844d7582..210fbd5f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 844d7582dc73ec0ec11f939cc1cf9e4abb4786e8 +Subproject commit 210fbd5f252da88d3ae7f191d5b987d793646712 diff --git a/qtwebview b/qtwebview index 8df88a17..3c347ac6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e +Subproject commit 3c347ac61ef444a0246921a58a51ccec6bab7413 From bf868c7e7a16fb7dcad22bc7a0d4b20cd578c352 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Apr 2019 22:31:02 +0200 Subject: [PATCH 40/44] Update submodules on '5.13' in qt5 Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893 Reviewed-by: Qt Submodule Update Bot --- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtmultimedia b/qtmultimedia index 82fdc891..d55edfc3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 82fdc8913483dd352ae2c326dd358fe9ff8f3f66 +Subproject commit d55edfc3cf6b65949835586b4b216cfd672c8380 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 90018127..0bf12eda 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9001812730bccd4ee5153ad47aa130b230c27d78 +Subproject commit 0bf12eda7c5863bf3b22306f501292a9c6f2aa16 diff --git a/qttools b/qttools index 66743ae9..d92b976f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 66743ae97387da43dc6f27e5237ec472edae35f5 +Subproject commit d92b976f7d092a31c67edc2c515ac2444cd2808d diff --git a/qtwebengine b/qtwebengine index 43eb77cb..d29125ea 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 43eb77cb0d93020ce7db27fa2ac8dc7ef7738709 +Subproject commit d29125ea49a6a7c86ea20a90a1f3fddb9b13d9f4 From f31970d5ac48cd2ae6601aca32738ea718edb265 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Apr 2019 08:18:53 +0200 Subject: [PATCH 41/44] Update submodules on '5.12' in qt5 Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 73698cb3..7b4f9dbf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 73698cb3401b9445ba0ad6b0a6cc3e125e50a745 +Subproject commit 7b4f9dbf270b6e3369da5f5c0187876dfad69e70 diff --git a/qtdeclarative b/qtdeclarative index b2fd2b66..fe3e9110 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b2fd2b664212344eb82b44f916c849314d5e02fb +Subproject commit fe3e9110327f022daf676766ce04b8a0a147c7c9 diff --git a/qtlocation b/qtlocation index 5c3e3464..397a31b1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac +Subproject commit 397a31b187d537f81610007b7d0f6f69b306dfd4 diff --git a/qtsensors b/qtsensors index f5281044..2c9fc2c1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f528104474dd74e34ea6a01da096e7c31730c01a +Subproject commit 2c9fc2c1a197b84ba9ef3dc4e586a77a18c3dcc5 diff --git a/qtserialbus b/qtserialbus index d5b3a2b6..fc5e6011 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d5b3a2b6e6462f4ad46fce8f52539333b131dcad +Subproject commit fc5e6011c1af70bd47a77796a0d0ab0fcd186541 diff --git a/qtwayland b/qtwayland index 5405de12..0b512866 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5405de120bba480f780e37e90fbd7c2ff1308b01 +Subproject commit 0b51286635ca3f724df94dd4d5268c950505f6ec diff --git a/qtwebengine b/qtwebengine index 44303861..89e5a7b1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 44303861fd116b3a279d26300147e89a0bf8121c +Subproject commit 89e5a7b1d874dda5b118017bfc6f16eee6a8493b From 869c15629d8397bc725c61da423a4a038ef4d395 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Apr 2019 22:30:55 +0200 Subject: [PATCH 42/44] Update submodules on '5.13' in qt5 Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a Reviewed-by: Qt Submodule Update Bot --- qtcharts | 2 +- qtconnectivity | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtcharts b/qtcharts index be2280a9..beda274e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit be2280a9600430d55595742ec75c08bb1556ec9b +Subproject commit beda274e7d8b5a6864b254a9e63b654f3c494139 diff --git a/qtconnectivity b/qtconnectivity index 1fdbe1c6..320a6b28 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1fdbe1c6a9b818b5928537f176fcf026b31e17a2 +Subproject commit 320a6b28499010b8eed6d507da5ebc23b56f5ccc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0bf12eda..131210b5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0bf12eda7c5863bf3b22306f501292a9c6f2aa16 +Subproject commit 131210b59133fcebe0ab3c7823777f2b859dc7cd diff --git a/qtscxml b/qtscxml index 6581f591..acddb067 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6581f5911eb1dec25fa4870aae8e70a58b6e8dfd +Subproject commit acddb0676cafdc83edd08aee87181bf5602d6387 diff --git a/qtsensors b/qtsensors index 27ad6151..c1b883f0 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 27ad61518b47d34733ca18a9ad3da72a691d453d +Subproject commit c1b883f076f3f2a9f1f73ea20ea4688a7056b4c1 diff --git a/qttranslations b/qttranslations index 8243693e..133f635a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8243693e684f8b5d28ed09ffd80a6322c6134f68 +Subproject commit 133f635a25ee58596fcb556b87e841257390758b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e117cfe3..67e497ff 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e117cfe3be46ccb82b0b3a9674d65ffb0f49e4df +Subproject commit 67e497ff407441515761b312599cb4ad6b61adad diff --git a/qtwayland b/qtwayland index 0b10284a..1b773df9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0b10284a3589b37a9d639f3d1af4b1d641fbb6ab +Subproject commit 1b773df93f5bccb6b616d2a228cb15cffe8e32d5 diff --git a/qtwebchannel b/qtwebchannel index f5f5eea1..24e0c897 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f5f5eea1e204642c25360106825a92a9336584b4 +Subproject commit 24e0c897fac375514396191db7b582505028c918 diff --git a/qtwebengine b/qtwebengine index d29125ea..bcf38ab5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d29125ea49a6a7c86ea20a90a1f3fddb9b13d9f4 +Subproject commit bcf38ab56ac6637ea557ea73e39f5cac319e8fbf diff --git a/qtwebsockets b/qtwebsockets index d451e0af..74c8ebe9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d451e0af881365ba7524ed93e1ef3f68154c784b +Subproject commit 74c8ebe9696c981311f19bdd6544634ab1b7cc7f From 085407eb93ab48f9650ac2eaaedc4230fd766e2f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Apr 2019 11:52:12 +0200 Subject: [PATCH 43/44] Update submodules on '5.13' in qt5 Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e Reviewed-by: Liang Qi --- qtconnectivity | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qtwebview | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index 320a6b28..ae7bcf5f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 320a6b28499010b8eed6d507da5ebc23b56f5ccc +Subproject commit ae7bcf5f5c3f3a227ddfacbf1178f3e791199455 diff --git a/qtlocation b/qtlocation index 394f7a1d..b392921e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 394f7a1dc772d2dfa1a65b456e623b7d09d0d482 +Subproject commit b392921e33b4e8d425f1881afb95e6d34e53879c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 131210b5..ced7d5af 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 131210b59133fcebe0ab3c7823777f2b859dc7cd +Subproject commit ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7 diff --git a/qtsensors b/qtsensors index c1b883f0..d1a1b629 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c1b883f076f3f2a9f1f73ea20ea4688a7056b4c1 +Subproject commit d1a1b62914d592bf0bb382accff29abc610d3fab diff --git a/qtserialbus b/qtserialbus index 3df07ae0..fe80eef6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3df07ae0b98dabbc2b60bab162173b24b010a4ee +Subproject commit fe80eef6b3377c8727c5190d275808c343ee7c75 diff --git a/qtsvg b/qtsvg index f799d19d..2043a358 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f799d19d6df12e20fc133ef8466d310427cc68ca +Subproject commit 2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7 diff --git a/qtwebview b/qtwebview index f625019a..d8958299 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f625019aef6dd336ead142d61ed480469c8711ee +Subproject commit d895829904a1de3f8a63d5ab56e73106847fddcf From f2af07b8edafa15594eed67afb68dc2481721541 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Apr 2019 22:30:49 +0200 Subject: [PATCH 44/44] Update submodules on '5.13' in qt5 Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25 Reviewed-by: Qt Submodule Update Bot --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index bcf38ab5..5de67028 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bcf38ab56ac6637ea557ea73e39f5cac319e8fbf +Subproject commit 5de670283e3093fcdd2a91dcca30ffbe0b03d230