From d5d380f452aafd1590dff1d3bc99347bb16bd6e4 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 13 Feb 2019 09:25:22 +0200 Subject: 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 -- cgit v1.2.3 From b3b6b100e64e0f47df141b086b3cfdf550296d51 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Feb 2019 19:31:04 +0100 Subject: 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 -- cgit v1.2.3 From 9c60d8b19081e57c51d5dd4942cac6c38ace3442 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 14 Feb 2019 11:40:45 +0200 Subject: 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 -- cgit v1.2.3 From 83d5226604365756adae991c4787edaf6d6b5c6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Feb 2019 12:43:28 +0000 Subject: 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 -- cgit v1.2.3 From becac559b713dfadd27198d683fde70551a543c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Feb 2019 20:33:50 +0100 Subject: 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 -- cgit v1.2.3 From ffe8fd770183b2abc293dc356f3ac82c56143bab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Feb 2019 10:51:03 +0100 Subject: 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 -- cgit v1.2.3 From 091820f6a12f3d1932adf974406b1b62a13662ef Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 19 Feb 2019 08:48:58 +0200 Subject: 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 -- cgit v1.2.3 From 3a1e557e5493272783d73030ac3b33cf500d459e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Feb 2019 12:45:32 +0000 Subject: 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 -- cgit v1.2.3 From 7100c54887416c99d9f4f08b81e61f1bd03fda3c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 17:45:51 +0000 Subject: 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 -- cgit v1.2.3 From 0660a25cca3c922346653e1bc486a0c8aa59f5aa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Feb 2019 14:00:21 +0200 Subject: 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 ++++++++++++++++++++++ .../qtci-windows-10-x86/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-10-x86_64/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-7-x86/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-7-x86_64/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-8.1-x86/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" + -- cgit v1.2.3 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: Provisioning: add dependency walker to win10 x86 Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint Reviewed-by: Heikki Halmet --- coin/provisioning/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" -- cgit v1.2.3 From 323dcdb60f041644d52e07d1235d87ff4999d3a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Mar 2019 16:14:01 +0100 Subject: 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 -- cgit v1.2.3 From 209b8117bd9c8ce3814a0ee70a4be476dc21eaf1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Mar 2019 14:29:14 +0100 Subject: 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 -- cgit v1.2.3 From 7cc57995bfd265a9c230d2e8c977b519de943dcc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 09:52:34 +0100 Subject: 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 -- cgit v1.2.3 From a97d669a2055b6e989e5d274da6cb14fafc66041 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 12 Mar 2019 11:31:53 +0200 Subject: 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 -- cgit v1.2.3 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: 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 -- cgit v1.2.3 From b02d849d764c794224db011fd4a746f477e31bc4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 20:55:48 +0100 Subject: 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 -- cgit v1.2.3 From 35b489b1bd2357f1ba6aba0537751ad2eb2a856c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Mar 2019 10:18:14 +0100 Subject: 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 -- cgit v1.2.3 From b9e40e2fd7dc11ee3890994fc492a09f0bc705d2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Mar 2019 20:28:14 +0100 Subject: 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 -- cgit v1.2.3 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: 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 +++------- .../qtci-macos-10.13-x86_64/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 + +set -ex -[ -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 +# 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 -- cgit v1.2.3 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: 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 + coin/provisioning/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 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh | 0 .../qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 1 + coin/provisioning/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 +++ coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 3 ++- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh | 1 + coin/provisioning/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 +++- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh | 4 +++- coin/provisioning/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 +++- .../qtci-macos-10.13-x86_64/21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 5 ----- coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh | 4 +++- 60 files changed, 93 insertions(+), 50 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 +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$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 +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" -- cgit v1.2.3 From 338fce191ac1e14b9365068021b4f7ec7ad50646 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 5 Apr 2019 10:12:36 +0200 Subject: 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 + + -- cgit v1.2.3 From 261cc1bd8ffcb14fffaf4d8ecc77e4c50c5dae17 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Apr 2019 17:22:29 +0200 Subject: 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 -- cgit v1.2.3 From 6db224cfc70c2b9b45a39c3e340cd327cc1b8723 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Apr 2019 20:24:06 +0200 Subject: 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 -- cgit v1.2.3 From 791ec923a799a7cdba0b926412aa9fedb4bdc983 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 26 Feb 2019 13:12:02 +0200 Subject: 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 -- cgit v1.2.3 From 21a6541aebfa90e78510460393636826391b54d7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Apr 2019 07:51:43 +0200 Subject: 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 -- cgit v1.2.3 From f31970d5ac48cd2ae6601aca32738ea718edb265 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Apr 2019 08:18:53 +0200 Subject: 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 -- cgit v1.2.3