From d5d380f452aafd1590dff1d3bc99347bb16bd6e4 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 13 Feb 2019 09:25:22 +0200 Subject: [PATCH 1/9] Adjust submodule branches Change-Id: I309db20815d3b383155e6549b649607e956b8d89 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..8b797957 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.2 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.2 status = addon From b3b6b100e64e0f47df141b086b3cfdf550296d51 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Feb 2019 19:31:04 +0100 Subject: [PATCH 2/9] Update submodules on '5.12.2' in qt5 Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index c4e9eabc..a5cded84 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c4e9eabc309a275efc222f4127f31ba4677259b7 +Subproject commit a5cded843f495b4276a8289b1324778d97bed5ba diff --git a/qtqa b/qtqa index 0797a581..50586f55 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0797a58105d77a9c4fbb1212eb376ca487d80f81 +Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 diff --git a/qttools b/qttools index b7decf54..6c8d8363 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b7decf54170ce71811bcbc13526e31914b0498e9 +Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 diff --git a/qtwebengine b/qtwebengine index 89ebafdb..3e88b4d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 89ebafdb6c41229f007d423aa785dea6ace07271 +Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e From 9c60d8b19081e57c51d5dd4942cac6c38ace3442 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 14 Feb 2019 11:40:45 +0200 Subject: [PATCH 3/9] Fix: Set correct path to environmental variable Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen --- coin/provisioning/common/unix/install-breakpad.sh | 2 +- coin/provisioning/common/windows/install-breakpad.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh index 669469be..b05b3510 100755 --- a/coin/provisioning/common/unix/install-breakpad.sh +++ b/coin/provisioning/common/unix/install-breakpad.sh @@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad" ) -SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src" +SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome" echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 index 4a9544cc..7db6d8ac 100644 --- a/coin/provisioning/common/windows/install-breakpad.ps1 +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -87,7 +87,7 @@ catch { git checkout $linux_syscall_support_commit_sha1 } -Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad" # Write HEAD commit sha to versions txt, so build can be repeated at later date Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt From 83d5226604365756adae991c4787edaf6d6b5c6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Feb 2019 12:43:28 +0000 Subject: [PATCH 4/9] Update submodules on '5.12.2' in qt5 Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index efa4665b..b237f38e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit efa4665b316dbd5361b0936a1135f45c141f14aa +Subproject commit b237f38e89016b40861de1e0675dc2ba5b3f361a diff --git a/qtactiveqt b/qtactiveqt index 4766c93e..b918e20d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4766c93e4df91ee3ecf510b5f011799e29f6093e +Subproject commit b918e20d4c9572bfc4148aba94ac53cf811b8cce diff --git a/qtbase b/qtbase index a5cded84..0f163887 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a5cded843f495b4276a8289b1324778d97bed5ba +Subproject commit 0f163887b526d00ccdcead907dde042aa370fc16 diff --git a/qtcanvas3d b/qtcanvas3d index 18e0ed4f..f9b7e894 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 18e0ed4fecb9642464c989a6c716a2b5cf400108 +Subproject commit f9b7e894b3d91bf760d71d7d784e2d162da0569e diff --git a/qtcharts b/qtcharts index 9da68921..694cf2bb 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9da68921e4bfb9c362600832b23128d488dc7aff +Subproject commit 694cf2bb87352f99e56aa687e13fdc7eeea40720 diff --git a/qtconnectivity b/qtconnectivity index 1606ccb7..1b19d798 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1606ccb76ba72990df652fbd7f01d709ae20b63c +Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b diff --git a/qtdatavis3d b/qtdatavis3d index 54adef94..428195cb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 +Subproject commit 428195cb2b1dc0c48eb348abb856cdaabf79dc0d diff --git a/qtdeclarative b/qtdeclarative index 91a71bce..dca09f09 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 91a71bce9c633934540e9f06fb081e3b89259ff3 +Subproject commit dca09f09734fff19a3a5ad930662e0e9abd3cb1b diff --git a/qtdoc b/qtdoc index 81200196..a38799f6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81200196ada801601c6c973643d2962be5a88ba7 +Subproject commit a38799f6e165e224750494bf515c78db4c4217db diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 56a4a58c..41ab3587 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 56a4a58c999e03385bad6ab052f87ffe2c63500f +Subproject commit 41ab3587cf0847e3442da6d14253e4bec4e87837 diff --git a/qtlocation b/qtlocation index 633b0f40..6c1c24e8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 +Subproject commit 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 diff --git a/qtmultimedia b/qtmultimedia index a7f01cea..4e47d0a7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a7f01cea43a16a9b2b06ab3a8ff3b62b8edce5cd +Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe diff --git a/qtnetworkauth b/qtnetworkauth index 83633211..bd9c083b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8363321174f64a1497952d2d7fec895a2a7e18f3 +Subproject commit bd9c083ba099a46d101ca64369f46ba7fba2a943 diff --git a/qtqa b/qtqa index 50586f55..e657206a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 +Subproject commit e657206a766f0cc48fe93f79bae01739387e2291 diff --git a/qtquickcontrols b/qtquickcontrols index 65d61277..b7f5cb18 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 65d61277be164a0781f9b57873afc000f36073fa +Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 579422fa..0dfc617e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 579422faaad76b12341a725320da65fcabb3cf7b +Subproject commit 0dfc617e4d089f7513573673d12f9678a88d3081 diff --git a/qtscxml b/qtscxml index 01399f96..dca1cd7c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01399f9600174a0c77ffc57d32c07ce0698952e1 +Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 diff --git a/qtsensors b/qtsensors index 7792137f..73d5160a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7792137f3fcd400f3933e8f7f328b35aa0586f81 +Subproject commit 73d5160ab8219015a25e59c62669b2926156b807 diff --git a/qtserialport b/qtserialport index b43e8fa2..624f1754 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 +Subproject commit 624f175492660301af5eb321d2b8d6af7aa7fbc3 diff --git a/qtspeech b/qtspeech index 0711336d..f899a4c2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0711336d26804898393a99640e1442df7fd3828c +Subproject commit f899a4c2051ca4256faba2d268ca032dd129f200 diff --git a/qtsvg b/qtsvg index a91a6563..2430c9ed 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a91a65632c4d830070e1ca9bbda7e355f1459414 +Subproject commit 2430c9ed20f3f10da7bc3e7fdb5328d8501f5776 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c099fef8..277aad92 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c099fef8041f6cfd56e789b86c70a802c894da34 +Subproject commit 277aad92fb5d5612c2b952f05063518d877a5138 diff --git a/qtwebengine b/qtwebengine index 3e88b4d3..8fefc0d9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e +Subproject commit 8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632 diff --git a/qtwebsockets b/qtwebsockets index 9a0a655b..b4bac09b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9a0a655b51086045ce86c9d001d34738d84d27ff +Subproject commit b4bac09b3b2f0c3072d797b22c44e20b661c4723 diff --git a/qtx11extras b/qtx11extras index 16528689..3bfaa268 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 165286899e3426730e5dfcd155f92b571c978416 +Subproject commit 3bfaa26890990d140caba4b9a1050906c2ee546c diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e2450f4..e8026ec6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e2450f4559f03a480e37318084bab99fdc128fc +Subproject commit e8026ec6a30c5124c2e3162d9a17e9ae11fa4475 From becac559b713dfadd27198d683fde70551a543c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Feb 2019 20:33:50 +0100 Subject: [PATCH 5/9] Update submodules on '5.12.2' in qt5 Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtcharts | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index b237f38e..3de900a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b237f38e89016b40861de1e0675dc2ba5b3f361a +Subproject commit 3de900a10c6fd051ba54727be2fd1fe47ed10481 diff --git a/qtandroidextras b/qtandroidextras index 1c7de170..860fd4b9 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1c7de1701f1f75c2ce6cfff1baa6ab49ee669073 +Subproject commit 860fd4b991a9f94f07aaf45cee36bab661f3dd28 diff --git a/qtcharts b/qtcharts index 694cf2bb..c9bc2672 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 694cf2bb87352f99e56aa687e13fdc7eeea40720 +Subproject commit c9bc2672b513a414708026f4271d247feaa26471 diff --git a/qtmultimedia b/qtmultimedia index 4e47d0a7..9caf4812 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe +Subproject commit 9caf4812e073829fc961eb466f1325106f041841 diff --git a/qtpurchasing b/qtpurchasing index dff997ec..2234141c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 +Subproject commit 2234141c0ec838dd537bec909c87e8a184125f68 diff --git a/qtqa b/qtqa index e657206a..507202b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e657206a766f0cc48fe93f79bae01739387e2291 +Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af diff --git a/qtremoteobjects b/qtremoteobjects index 5f941451..1c19349a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5f94145128035bce167ca23780296564aa5f25d1 +Subproject commit 1c19349a28a75eec386b84af142fc571e492a3c3 diff --git a/qtscxml b/qtscxml index dca1cd7c..4bb7aa3f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 +Subproject commit 4bb7aa3f3002b9ba85494e5cf4808f68e0edc502 diff --git a/qtserialbus b/qtserialbus index 670f912f..745120dd 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 670f912fbc08002ac063504755fc7705931e0d6e +Subproject commit 745120ddca5fa67f1a87741e0a5c016acbd53deb diff --git a/qttools b/qttools index 6c8d8363..b0147a5d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 +Subproject commit b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8 diff --git a/qtwayland b/qtwayland index 4b58ff21..0d717b0c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4b58ff21f4a3c629867064289b6c778bbb57f95a +Subproject commit 0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb diff --git a/qtwebview b/qtwebview index 17334eb5..0aa43dc5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17334eb56b42114927169ee8eec6512754674fb2 +Subproject commit 0aa43dc555e0a820bf13a6b12671ee6a79161155 diff --git a/qtwinextras b/qtwinextras index f2dc1d1a..23dd4484 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 +Subproject commit 23dd4484915e3de89a093f8525afed1c5b8294eb From ffe8fd770183b2abc293dc356f3ac82c56143bab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Feb 2019 10:51:03 +0100 Subject: [PATCH 6/9] Update submodules on '5.12.2' in qt5 Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index dca09f09..00f283cf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dca09f09734fff19a3a5ad930662e0e9abd3cb1b +Subproject commit 00f283cf54068ec55ead07df44c424c629894749 diff --git a/qtquickcontrols b/qtquickcontrols index b7f5cb18..d641c584 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e +Subproject commit d641c584b1ed5cfae860dc0e9b08526ae6eb2c93 diff --git a/qtwebengine b/qtwebengine index 8fefc0d9..b47b28d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632 +Subproject commit b47b28d3cfb8b249cce343031507864de99117a7 From 091820f6a12f3d1932adf974406b1b62a13662ef Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 19 Feb 2019 08:48:58 +0200 Subject: [PATCH 7/9] Remove qt3d-runtime.txt symbolic link from platform configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) mode change 120000 => 100644 coin/platform_configs/qt3d-runtime.txt diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 120000 index 9b3b4cd8..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1 +0,0 @@ -qt5.txt \ No newline at end of file diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 100644 index 00000000..3de18a74 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1,22 @@ +Template Target OS Target arch Compiler Target Compiler Features +--------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From 3a1e557e5493272783d73030ac3b33cf500d459e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Feb 2019 12:45:32 +0000 Subject: [PATCH 8/9] Update submodules on '5.12.2' in qt5 Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtwebchannel | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 0f163887..e8d3306c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0f163887b526d00ccdcead907dde042aa370fc16 +Subproject commit e8d3306c8f86bf21648693521d8be91bb8f1335e diff --git a/qtconnectivity b/qtconnectivity index 1b19d798..eec8fed7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b +Subproject commit eec8fed760a572eb9187f79b43d87986f2b4f404 diff --git a/qtdeclarative b/qtdeclarative index 00f283cf..cd7ce85f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00f283cf54068ec55ead07df44c424c629894749 +Subproject commit cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f diff --git a/qtdoc b/qtdoc index a38799f6..ecc569fb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a38799f6e165e224750494bf515c78db4c4217db +Subproject commit ecc569fbcd1dc41cc08796a42752ff394826771b diff --git a/qtgamepad b/qtgamepad index 8dd9ee5e..744e13b3 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39 +Subproject commit 744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b diff --git a/qtimageformats b/qtimageformats index 0e8422be..1b8478f8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0e8422bedc8c84ff7c08c6b3163329e82c2007dd +Subproject commit 1b8478f86f15dc1dd125a2a0d8331bc3600a79c1 diff --git a/qtlocation b/qtlocation index 6c1c24e8..a00c5e40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 +Subproject commit a00c5e40a2df03713d29da83a5692f2d7c15326d diff --git a/qtmacextras b/qtmacextras index 18594a39..4509e67e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 18594a3928dbc82597cf6d9fb90ca07d2a67bcb1 +Subproject commit 4509e67e2206f9077645d5946faf7dc2f1132156 diff --git a/qtquickcontrols b/qtquickcontrols index d641c584..c231395e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d641c584b1ed5cfae860dc0e9b08526ae6eb2c93 +Subproject commit c231395eec3494619f4977b4c5cd845b9d7341ae diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0dfc617e..ca799283 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0dfc617e4d089f7513573673d12f9678a88d3081 +Subproject commit ca799283a2266b023923286b4928fdf6e7211569 diff --git a/qtscript b/qtscript index 5a9de40f..6c0edaf3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5a9de40f48f5854b6ff20329ced0f0509b81b48a +Subproject commit 6c0edaf30c5bdfc2739ca646da73dcb697ab1361 diff --git a/qtwebchannel b/qtwebchannel index d14c6aa5..45da510a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 +Subproject commit 45da510a0a87593a2ae6f98e41bb01b9d39ace58 From 7100c54887416c99d9f4f08b81e61f1bd03fda3c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 17:45:51 +0000 Subject: [PATCH 9/9] 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