From 05c1f1cf9917f0c59968e91edd8262aa6932a3c1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Jan 2019 20:33:44 +0100 Subject: [PATCH 01/30] Update submodules on '5.12.1' in qt5 Change-Id: I1e2e226840416c8ae0166950dd62a3180dd52ee1 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 +- 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 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 21a1469f..535f7105 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 21a1469fb6df237ac1475d1b8c973bb601548f68 +Subproject commit 535f71053d3ca193666d7583f1961280d50da9f5 diff --git a/qtactiveqt b/qtactiveqt index 3387f697..d33a671b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3387f6974940e412b7f2070d9ecac84597043af5 +Subproject commit d33a671b159f5316ddb7e39f375a07d8740c9d15 diff --git a/qtandroidextras b/qtandroidextras index b4ea411e..8f931f2d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b4ea411eeda2d816605197b4c6a6b2710147e70a +Subproject commit 8f931f2d48ad6e4b1518142036d7631162f57915 diff --git a/qtbase b/qtbase index 5d276d6a..f05cc414 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5d276d6a1d75d3aca9e206950125e7a77f35ef67 +Subproject commit f05cc4144e06fd06eed12a3e427eb49e7ad1cf85 diff --git a/qtcanvas3d b/qtcanvas3d index 9702687d..f0552b1e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9702687d29745038a54acdb4625e3e6aa7e2694a +Subproject commit f0552b1eb14568fa6802191d13a1123effdbb636 diff --git a/qtcharts b/qtcharts index 5893fd03..eb852ca7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5893fd038e4b299d235b9df9afe912c914fca2ae +Subproject commit eb852ca7e5800577762663bc72b1f9d009cf7e51 diff --git a/qtconnectivity b/qtconnectivity index 60863d84..193e53e5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 60863d840e5ed256bafddc2c98067dd28166df07 +Subproject commit 193e53e544ebbb5ee60d4ad798648df345679e5a diff --git a/qtdatavis3d b/qtdatavis3d index a8c1b85b..20f42d4c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a8c1b85b91925a7868eeef1fad9e7d1606473f47 +Subproject commit 20f42d4c87162992fc2322e65aee1a1e2b1f28a2 diff --git a/qtdeclarative b/qtdeclarative index ea725e1b..c57681bc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ea725e1b54e5a28fb7c37f23acfdd95e6269624a +Subproject commit c57681bc376d1d912d23b044c48932fa8f7816d7 diff --git a/qtdoc b/qtdoc index a58fa967..ec479952 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a58fa967f267f2ad6f8fbfaec12a5d978b2b6e10 +Subproject commit ec479952c079c4e3f6b0c015e82f7060af9706bc diff --git a/qtgamepad b/qtgamepad index c683f8fe..2d532f3d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c683f8feb6cfd9f3b14c85e6eca86b30b7edda9d +Subproject commit 2d532f3d84654e75273af4a5a34310413555e00f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 62ab0462..5b242913 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 62ab04625a77119b0a36d8aef556768e5a08224f +Subproject commit 5b24291329cdbd19b795b4c3d8aafc4ffd916a2d diff --git a/qtimageformats b/qtimageformats index c522f9d4..178b8572 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c522f9d430119447dfbf673252255de9171744e4 +Subproject commit 178b8572d71a34975ffd7ada87227e1b8ed7296e diff --git a/qtlocation b/qtlocation index be0658bf..1e24cec7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit be0658bfdb37de213f6b54837706aabc2d088d62 +Subproject commit 1e24cec7e3ebf5f62f5440d848caf6cd9db1e456 diff --git a/qtmacextras b/qtmacextras index 802f3e45..5d104972 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 802f3e4593e7f3c1b43f8e1b050af73a70047e5f +Subproject commit 5d10497214e0dbb3f7d5c2368e5757789ffbbdae diff --git a/qtmultimedia b/qtmultimedia index 06f1f32d..982d4c95 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 06f1f32daa89265269532a02457e73912da3c2d7 +Subproject commit 982d4c9505cf427709aac18346dd9df4a13f76c5 diff --git a/qtnetworkauth b/qtnetworkauth index c8530448..71318ed0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c85304484261af2fc046c909087549799a5979f9 +Subproject commit 71318ed079ddf7c0c3af9d70f64b9519e23b7499 diff --git a/qtpurchasing b/qtpurchasing index 6a44af03..2de8d672 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6a44af0358bb5bccb4ec9ae2ab9e2bae95cf4444 +Subproject commit 2de8d672b596c6a67afc2a72a293a08d0a3912d8 diff --git a/qtqa b/qtqa index bf81b426..25a8c32e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bf81b426eceab105d74c0f91eb55e84d6d9ad518 +Subproject commit 25a8c32e77692f6ffc5d73136cd6d74cf293e081 diff --git a/qtquickcontrols b/qtquickcontrols index 50b6fb27..5e2dfd09 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 50b6fb27458708a18f4114e3ebec0fa632b2659f +Subproject commit 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e25970ff..b563bd58 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e25970ffff3db1d0b2de17510514b5f92c5ba3eb +Subproject commit b563bd583a50442b52e47f8c5f149aebafb385f2 diff --git a/qtremoteobjects b/qtremoteobjects index d369df14..b513d17f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d369df14bc634dde9c4c1a101379bb5a536f0332 +Subproject commit b513d17fe19c3cf8790d989626521b52f6d1b3d6 diff --git a/qtscript b/qtscript index 5ccd29d6..b65a9693 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5ccd29d6720260712655cc6f722824e5fcf11fb3 +Subproject commit b65a9693f730f625cda95684acfaefd21538a5da diff --git a/qtscxml b/qtscxml index bde8d341..1043e8ab 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bde8d341cc095a3877e4ecc80b02c267bb651d4b +Subproject commit 1043e8abd566aa92f63acedbe188a51e83b9555c diff --git a/qtsensors b/qtsensors index f0c13a29..36d12d57 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f0c13a29a023c3ab42e4a514eea52585896c1c9e +Subproject commit 36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0 diff --git a/qtserialbus b/qtserialbus index fb7a0ef5..ce265ff8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb7a0ef5b31cba52a745006bf9dca61101229de8 +Subproject commit ce265ff81223bf7a5978e66dba59fb4b10469b9e diff --git a/qtserialport b/qtserialport index 4114f45f..a15a7f13 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4114f45fa8f4863a91c37ee06e93275d8b416853 +Subproject commit a15a7f1362454a575a4420cdd89498f42055fe48 diff --git a/qtspeech b/qtspeech index 85e0d04e..f224e530 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 85e0d04e21d2f47eaa0b31c26ee4e04712d523db +Subproject commit f224e5309bc9ee6bf37eb9be2ed345f2cfcb4ce5 diff --git a/qtsvg b/qtsvg index 1a66404f..aa7431fd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1a66404fd0312a835da03a940894737c1bf77310 +Subproject commit aa7431fdabc0434bc30ae8af0753be8c1cb9b576 diff --git a/qttools b/qttools index 7d049fb8..32897fd0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7d049fb8c8e23a570f5bff95adf49beba44c1619 +Subproject commit 32897fd0b98966d22ecbd475a0e6a77ca8b1108d diff --git a/qttranslations b/qttranslations index 350e19a3..074b7308 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 350e19a33858960f513c9e6f2cd57839e9ed04a5 +Subproject commit 074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3715b427..5aaf55ad 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3715b42724b2683454a1ffc1e7d31e13ea449520 +Subproject commit 5aaf55adcf3742e05283274ce1b8c721c7da7c8d diff --git a/qtwayland b/qtwayland index 4fa1ed2d..09b6fcf3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4fa1ed2dfe7ae42b940d6d28e4c1066853e7768a +Subproject commit 09b6fcf3ec501cb94d89833745264a16c2a74209 diff --git a/qtwebchannel b/qtwebchannel index 7ab88507..a7bb2699 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7ab88507fbd43cc51c2600c1656ed32d56d3703a +Subproject commit a7bb269981ad50bd4e8140aa1d9af9e5abd0784d diff --git a/qtwebengine b/qtwebengine index e76f9a91..540ca045 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e76f9a9106e28a8d2328e00c66071cee3b87d504 +Subproject commit 540ca045f883d9961a982573a6c30cb7256b7d2c diff --git a/qtwebglplugin b/qtwebglplugin index bffb574a..d0c4de38 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bffb574a3c28e4b29b4265b255aeef294e70051a +Subproject commit d0c4de38ddc18792c7a8a90ef2d0091b51736dd3 diff --git a/qtwebsockets b/qtwebsockets index 3031fd36..a53a28b9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3031fd369cfb5b7f03aabc61f239adc1268302ff +Subproject commit a53a28b971e3ae1a4a2baf7320ba60f5077f5596 diff --git a/qtwebview b/qtwebview index d53e3164..a14a1174 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d53e316480889660e1668ef4b46a122dc333c499 +Subproject commit a14a1174cdc7ee2142abd33f85ea820eca90c968 diff --git a/qtwinextras b/qtwinextras index 0a0c4f76..669a0856 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0a0c4f76383683ec799344bb57bc44954231c265 +Subproject commit 669a0856ffb6908f02ee6212073fa5799c63fea0 diff --git a/qtx11extras b/qtx11extras index 2326dcdf..12bfa3cb 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 2326dcdf30772c7a73136b5537c02128884579a0 +Subproject commit 12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c diff --git a/qtxmlpatterns b/qtxmlpatterns index 19b28e27..274f162f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 19b28e271ca3f4d0042b739e90b3d902f2866044 +Subproject commit 274f162fd41c4de88df7efda9e6ec16a1ca968bc From 0f8243bce8db8233fbc8cf7b1e39a66135215d62 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 8 Jan 2019 13:35:16 +0100 Subject: [PATCH 02/30] Adjust submodule branches Change-Id: I581af0bcf61605f9cc9ee24dc9dc1c916b91abbd Reviewed-by: Jani Heikkinen --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..f38a0aa1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.1 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.1 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.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.1 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.1 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.1 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.1 status = addon From 5256ac9c60e571349313053e4c9b73ca5d394fb5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Jan 2019 15:44:46 +0100 Subject: [PATCH 03/30] Update submodules on '5.12.1' in qt5 Change-Id: I6bfbe10520706d6c93037585b1e78b8b85cd3ea1 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 535f7105..d12aced2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 535f71053d3ca193666d7583f1961280d50da9f5 +Subproject commit d12aced2ea1673a51429a4f0c34b72c9a6a766ae diff --git a/qtactiveqt b/qtactiveqt index d33a671b..22bcc219 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d33a671b159f5316ddb7e39f375a07d8740c9d15 +Subproject commit 22bcc219a54ddccf000ca6f33057f94ed8bb9551 diff --git a/qtandroidextras b/qtandroidextras index 8f931f2d..48256a15 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8f931f2d48ad6e4b1518142036d7631162f57915 +Subproject commit 48256a153eefaeb772d3be97b0c19e3402e0e027 diff --git a/qtbase b/qtbase index f05cc414..2327944d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f05cc4144e06fd06eed12a3e427eb49e7ad1cf85 +Subproject commit 2327944d241f48495a7b867b8e206a4c8c5d52e3 diff --git a/qtcanvas3d b/qtcanvas3d index f0552b1e..893fbdd0 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f0552b1eb14568fa6802191d13a1123effdbb636 +Subproject commit 893fbdd0f0002b3ff74f6f428329191d120ed439 diff --git a/qtcharts b/qtcharts index eb852ca7..ce310464 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit eb852ca7e5800577762663bc72b1f9d009cf7e51 +Subproject commit ce310464de075a6865952c0845f93a6ea3c1ff6c diff --git a/qtconnectivity b/qtconnectivity index 193e53e5..1b4bf7b4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 193e53e544ebbb5ee60d4ad798648df345679e5a +Subproject commit 1b4bf7b4e82f5f320da9f78ef4c23a3330c41737 diff --git a/qtdatavis3d b/qtdatavis3d index 20f42d4c..9ab15db1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 20f42d4c87162992fc2322e65aee1a1e2b1f28a2 +Subproject commit 9ab15db10215cef84a58a57411f1d27f83aa4b66 diff --git a/qtdeclarative b/qtdeclarative index c57681bc..c2c012f7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c57681bc376d1d912d23b044c48932fa8f7816d7 +Subproject commit c2c012f79438d207cc95237c90b692121acc4876 diff --git a/qtdoc b/qtdoc index ec479952..bfe54113 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ec479952c079c4e3f6b0c015e82f7060af9706bc +Subproject commit bfe541139193dafed078c31469e5640ca4c74216 diff --git a/qtgamepad b/qtgamepad index 2d532f3d..35753029 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2d532f3d84654e75273af4a5a34310413555e00f +Subproject commit 357530292e29a25ff6ddec17a3acbf67588813e8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5b242913..7160cd9f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5b24291329cdbd19b795b4c3d8aafc4ffd916a2d +Subproject commit 7160cd9f64cd4045ed23124265b9258e880945a3 diff --git a/qtimageformats b/qtimageformats index 178b8572..cbdabc6a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 178b8572d71a34975ffd7ada87227e1b8ed7296e +Subproject commit cbdabc6a23d9ac66c7361a4437f649aacab7d900 diff --git a/qtlocation b/qtlocation index 1e24cec7..f1dd1363 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1e24cec7e3ebf5f62f5440d848caf6cd9db1e456 +Subproject commit f1dd13632651a9efd0ea976a3efdd9c555a34bc2 diff --git a/qtmacextras b/qtmacextras index 5d104972..a76ea12d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5d10497214e0dbb3f7d5c2368e5757789ffbbdae +Subproject commit a76ea12dc8f740b2adfd095ea3d6a6c727e27da1 diff --git a/qtmultimedia b/qtmultimedia index 982d4c95..6fde0c56 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 982d4c9505cf427709aac18346dd9df4a13f76c5 +Subproject commit 6fde0c5698d02db489a42e7108260327bae357b1 diff --git a/qtnetworkauth b/qtnetworkauth index 71318ed0..c6d51bdf 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 71318ed079ddf7c0c3af9d70f64b9519e23b7499 +Subproject commit c6d51bdf097c133955a247c9ebc600c5bc6cff58 diff --git a/qtpurchasing b/qtpurchasing index 2de8d672..ba689d67 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 2de8d672b596c6a67afc2a72a293a08d0a3912d8 +Subproject commit ba689d672e74c89bc0aca78f2a8e816c279e9100 diff --git a/qtquickcontrols b/qtquickcontrols index 5e2dfd09..bd952e90 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb +Subproject commit bd952e904070d8eb07748d620829e9dadb8022ba diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b563bd58..71534dcf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b563bd583a50442b52e47f8c5f149aebafb385f2 +Subproject commit 71534dcff9d122891b5059baccd7f3dec21e063a diff --git a/qtremoteobjects b/qtremoteobjects index b513d17f..2ff39119 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b513d17fe19c3cf8790d989626521b52f6d1b3d6 +Subproject commit 2ff39119f08fd23bc2cac404fdd3e0beb621e269 diff --git a/qtscript b/qtscript index b65a9693..520fb917 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b65a9693f730f625cda95684acfaefd21538a5da +Subproject commit 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 diff --git a/qtscxml b/qtscxml index 1043e8ab..2dfb1d04 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1043e8abd566aa92f63acedbe188a51e83b9555c +Subproject commit 2dfb1d046d4a1dcb046bfb287d240a8869c78baa diff --git a/qtsensors b/qtsensors index 36d12d57..72d07cd0 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0 +Subproject commit 72d07cd0eb9aa6f1b5dc5ce9542d96191b2466a2 diff --git a/qtserialbus b/qtserialbus index ce265ff8..dec7fea8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ce265ff81223bf7a5978e66dba59fb4b10469b9e +Subproject commit dec7fea8094497dc708e9be6c4b1cd0891611556 diff --git a/qtserialport b/qtserialport index a15a7f13..e43a75e6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a15a7f1362454a575a4420cdd89498f42055fe48 +Subproject commit e43a75e6f07967a3f7ff398ed46d04aefb8890ec diff --git a/qtspeech b/qtspeech index f224e530..66aa85ed 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f224e5309bc9ee6bf37eb9be2ed345f2cfcb4ce5 +Subproject commit 66aa85ede203372e3c9eba6c399379fa2f3de43f diff --git a/qtsvg b/qtsvg index aa7431fd..e920bcf8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aa7431fdabc0434bc30ae8af0753be8c1cb9b576 +Subproject commit e920bcf83abc618a31cd71bff831322e3d1a4be3 diff --git a/qttools b/qttools index 32897fd0..4f101ffe 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 32897fd0b98966d22ecbd475a0e6a77ca8b1108d +Subproject commit 4f101ffed20065cf7ad307a584f00ae719982110 diff --git a/qttranslations b/qttranslations index 074b7308..c36807f0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a +Subproject commit c36807f030790ed9bcf9e790d02f765d67d2b8ea diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5aaf55ad..a71c7de9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5aaf55adcf3742e05283274ce1b8c721c7da7c8d +Subproject commit a71c7de9347f3527359e16d27efeab59a53485bb diff --git a/qtwayland b/qtwayland index 09b6fcf3..6258c499 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 09b6fcf3ec501cb94d89833745264a16c2a74209 +Subproject commit 6258c4994200348220be6f35667a2c0f4b705539 diff --git a/qtwebchannel b/qtwebchannel index a7bb2699..8a61121c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a7bb269981ad50bd4e8140aa1d9af9e5abd0784d +Subproject commit 8a61121ce8e4c2c22fb442d4f7ad50a3a5b2ca1a diff --git a/qtwebengine b/qtwebengine index 540ca045..846320f5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 540ca045f883d9961a982573a6c30cb7256b7d2c +Subproject commit 846320f5877aafb9c7b319da6c972786805d9c30 diff --git a/qtwebglplugin b/qtwebglplugin index d0c4de38..c76e2a37 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d0c4de38ddc18792c7a8a90ef2d0091b51736dd3 +Subproject commit c76e2a37310f1e94002488fe33d56d6b00f2d626 diff --git a/qtwebsockets b/qtwebsockets index a53a28b9..71fc4338 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a53a28b971e3ae1a4a2baf7320ba60f5077f5596 +Subproject commit 71fc43384f54b8b1625c22f119b88fb83670b210 diff --git a/qtwebview b/qtwebview index a14a1174..0a68deca 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a14a1174cdc7ee2142abd33f85ea820eca90c968 +Subproject commit 0a68deca4de8eca51024cd7ca4235d274cf984fd diff --git a/qtwinextras b/qtwinextras index 669a0856..fac73fd0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 669a0856ffb6908f02ee6212073fa5799c63fea0 +Subproject commit fac73fd06ec6084c41190e80df59a66bc72f7fdb diff --git a/qtx11extras b/qtx11extras index 12bfa3cb..4fcf15c5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c +Subproject commit 4fcf15c521b3c147035acf35d89dcd77c134e3bf diff --git a/qtxmlpatterns b/qtxmlpatterns index 274f162f..a6efe402 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 274f162fd41c4de88df7efda9e6ec16a1ca968bc +Subproject commit a6efe4020c83384b0aa88aa71da49fce679bc24d From 616178cfb28b3896d19d6cdc56eee44d362ba472 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 Jan 2019 22:34:33 +0100 Subject: [PATCH 04/30] Update submodules on '5.12.1' in qt5 Change-Id: I8768b71048a5602b4a716b3a6da8b570f5e8e51a Reviewed-by: Liang Qi --- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtpurchasing | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index 2327944d..74c8aa76 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2327944d241f48495a7b867b8e206a4c8c5d52e3 +Subproject commit 74c8aa76089ce0b16ddd4d560530cf6df85d397e diff --git a/qtcanvas3d b/qtcanvas3d index 893fbdd0..101fdeb3 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 893fbdd0f0002b3ff74f6f428329191d120ed439 +Subproject commit 101fdeb344af67a65ae801248cccc11b9b576b8d diff --git a/qtcharts b/qtcharts index ce310464..5ea5bc74 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ce310464de075a6865952c0845f93a6ea3c1ff6c +Subproject commit 5ea5bc7413901375a112f482fae365bfebd7c8aa diff --git a/qtdatavis3d b/qtdatavis3d index 9ab15db1..7f661ab6 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9ab15db10215cef84a58a57411f1d27f83aa4b66 +Subproject commit 7f661ab61611d48f4491c1fa9d7932e822e9b050 diff --git a/qtdeclarative b/qtdeclarative index c2c012f7..09e3e543 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c2c012f79438d207cc95237c90b692121acc4876 +Subproject commit 09e3e5438182de606ecbd8f352eddc482f78891f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7160cd9f..2c15783c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7160cd9f64cd4045ed23124265b9258e880945a3 +Subproject commit 2c15783c02e3abfc3c528d270c448d1d555c8036 diff --git a/qtimageformats b/qtimageformats index cbdabc6a..3987e304 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cbdabc6a23d9ac66c7361a4437f649aacab7d900 +Subproject commit 3987e304dfa458457767fbe8b8a3d351dbb3b2c2 diff --git a/qtpurchasing b/qtpurchasing index ba689d67..9b316440 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ba689d672e74c89bc0aca78f2a8e816c279e9100 +Subproject commit 9b316440eeabee1c3220241c3eb79954f1dc91bc diff --git a/qtscript b/qtscript index 520fb917..6c51f94f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 +Subproject commit 6c51f94f5cd9afc90d5b28071c8a3ba9983d2853 diff --git a/qtsensors b/qtsensors index 72d07cd0..83e59fed 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 72d07cd0eb9aa6f1b5dc5ce9542d96191b2466a2 +Subproject commit 83e59fedc5099168c4c1682f63b0e49a2ba61a22 diff --git a/qtserialport b/qtserialport index e43a75e6..938fdd74 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e43a75e6f07967a3f7ff398ed46d04aefb8890ec +Subproject commit 938fdd74f17d8f0e03b491bd0093340b90f52ff4 diff --git a/qttools b/qttools index 4f101ffe..6b37c984 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4f101ffed20065cf7ad307a584f00ae719982110 +Subproject commit 6b37c984fb82a12f0b0e065093f5b180634a9ebe diff --git a/qtwayland b/qtwayland index 6258c499..657b6ce0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6258c4994200348220be6f35667a2c0f4b705539 +Subproject commit 657b6ce0677e05984a2f11900c66dbca775ff313 From da3ffbea171e476d8db104e0c42dcd3615377052 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 Jan 2019 05:29:33 +0000 Subject: [PATCH 05/30] Update submodules on '5.12.1' in qt5 Change-Id: Idf66e86252cea5b32bac9df3ebaa592936bc34d6 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtdoc | 2 +- qtmacextras | 2 +- qtquickcontrols | 2 +- qtscxml | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 22bcc219..fe276a86 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 22bcc219a54ddccf000ca6f33057f94ed8bb9551 +Subproject commit fe276a86f0dff5f817a76a351271f600be0e711b diff --git a/qtdoc b/qtdoc index bfe54113..f7f5859f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bfe541139193dafed078c31469e5640ca4c74216 +Subproject commit f7f5859f46158be778222ee1b4fcfff5fc8361de diff --git a/qtmacextras b/qtmacextras index a76ea12d..ee7ebf39 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a76ea12dc8f740b2adfd095ea3d6a6c727e27da1 +Subproject commit ee7ebf396fcb806d1022bdea0ffe5f0c632b8f3d diff --git a/qtquickcontrols b/qtquickcontrols index bd952e90..9b88ca4f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bd952e904070d8eb07748d620829e9dadb8022ba +Subproject commit 9b88ca4f033135f1a60871873da7f0732bc19d4d diff --git a/qtscxml b/qtscxml index 2dfb1d04..e64b9a5d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2dfb1d046d4a1dcb046bfb287d240a8869c78baa +Subproject commit e64b9a5d33b6f13fce93a553661c29a8a4901087 diff --git a/qtsvg b/qtsvg index e920bcf8..71ddbcf5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e920bcf83abc618a31cd71bff831322e3d1a4be3 +Subproject commit 71ddbcf502c5dafdcb98aa00c87fcf419aaa9b99 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a71c7de9..6f668860 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a71c7de9347f3527359e16d27efeab59a53485bb +Subproject commit 6f668860ede55d261a53163bc1a3956f84dd9d67 diff --git a/qtwebchannel b/qtwebchannel index 8a61121c..b2d34596 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8a61121ce8e4c2c22fb442d4f7ad50a3a5b2ca1a +Subproject commit b2d34596a1ed3cd1844eaa9ef3a338e12104ba3d diff --git a/qtwebengine b/qtwebengine index 846320f5..3f501ed2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 846320f5877aafb9c7b319da6c972786805d9c30 +Subproject commit 3f501ed2cf4a0a54aeddce9e83effcd8d37c754b diff --git a/qtwinextras b/qtwinextras index fac73fd0..cd9b2c76 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fac73fd06ec6084c41190e80df59a66bc72f7fdb +Subproject commit cd9b2c76cd3f76e1011ae89c34bed4d4ee0ec584 diff --git a/qtx11extras b/qtx11extras index 4fcf15c5..857c981c 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 4fcf15c521b3c147035acf35d89dcd77c134e3bf +Subproject commit 857c981c6c4c9a9a1b242225d869e9c40861ba34 diff --git a/qtxmlpatterns b/qtxmlpatterns index a6efe402..fe5b5faf 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a6efe4020c83384b0aa88aa71da49fce679bc24d +Subproject commit fe5b5faf66f6e752f8425fd56326f47fd4888b76 From 3855853e341c81253a58d03f233e133be5dc42de Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 13 Jan 2019 22:16:09 +0100 Subject: [PATCH 06/30] Update submodules on '5.12.1' in qt5 Change-Id: I0e1da14b452ed6237831dca5459627f29621182e Reviewed-by: Liang Qi --- qtandroidextras | 2 +- qtbase | 2 +- qtgamepad | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebview | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 48256a15..4505f993 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 48256a153eefaeb772d3be97b0c19e3402e0e027 +Subproject commit 4505f993f74b21f06ac46b6448a2408048bfd2dd diff --git a/qtbase b/qtbase index 74c8aa76..5dadc3d8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 74c8aa76089ce0b16ddd4d560530cf6df85d397e +Subproject commit 5dadc3d807af89c37b002749d3b39bfc94b10acd diff --git a/qtgamepad b/qtgamepad index 35753029..1f15fda1 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 357530292e29a25ff6ddec17a3acbf67588813e8 +Subproject commit 1f15fda174b53bc6dcaa19653dd5a791b4cbb4bd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 71534dcf..1157ad6d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 71534dcff9d122891b5059baccd7f3dec21e063a +Subproject commit 1157ad6df74c746e96cadac1ee9a226811f4d084 diff --git a/qtremoteobjects b/qtremoteobjects index 2ff39119..e1c0dbea 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2ff39119f08fd23bc2cac404fdd3e0beb621e269 +Subproject commit e1c0dbeadcfd34699f080edc49815761672616c1 diff --git a/qtserialbus b/qtserialbus index dec7fea8..c6ff631f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit dec7fea8094497dc708e9be6c4b1cd0891611556 +Subproject commit c6ff631f832f0e4f5aa703cd952530341ab74296 diff --git a/qtwayland b/qtwayland index 657b6ce0..d296dea1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 657b6ce0677e05984a2f11900c66dbca775ff313 +Subproject commit d296dea131ad51cfb4809e9a5e2d6908b2844a57 diff --git a/qtwebview b/qtwebview index 0a68deca..85cf48d6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0a68deca4de8eca51024cd7ca4235d274cf984fd +Subproject commit 85cf48d62a20652b150ce29b78c269d4937edf7c From 017d9e2ee3592ee86697bbcd34854d73793b1811 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 Jan 2019 04:13:08 +0000 Subject: [PATCH 07/30] Update submodules on '5.12.1' in qt5 Change-Id: Idc5f439eb75011f6ec422f37050ced3fec879a6c Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtspeech | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index d12aced2..a0496abe 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d12aced2ea1673a51429a4f0c34b72c9a6a766ae +Subproject commit a0496abe3890766638e8601c4bd11ba1755138e3 diff --git a/qtbase b/qtbase index 5dadc3d8..7d1af8fa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5dadc3d807af89c37b002749d3b39bfc94b10acd +Subproject commit 7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9 diff --git a/qtconnectivity b/qtconnectivity index 1b4bf7b4..736d3e14 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1b4bf7b4e82f5f320da9f78ef4c23a3330c41737 +Subproject commit 736d3e14bbf28c90ff51c017ceea6c2bc0c7698d diff --git a/qtdeclarative b/qtdeclarative index 09e3e543..a566125b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 09e3e5438182de606ecbd8f352eddc482f78891f +Subproject commit a566125b9fcc023237b442e5b9a838d40455c8fe diff --git a/qtlocation b/qtlocation index f1dd1363..bfb88b7a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f1dd13632651a9efd0ea976a3efdd9c555a34bc2 +Subproject commit bfb88b7a87e5dbed77d25998e386f8b5cc4e21d5 diff --git a/qtmultimedia b/qtmultimedia index 6fde0c56..10ac9321 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6fde0c5698d02db489a42e7108260327bae357b1 +Subproject commit 10ac932185707f0084cec7b1cfe0a6a2073b20a9 diff --git a/qtnetworkauth b/qtnetworkauth index c6d51bdf..410c82cd 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c6d51bdf097c133955a247c9ebc600c5bc6cff58 +Subproject commit 410c82cdd09bbcc2f236f8c2e85af726b1976904 diff --git a/qtqa b/qtqa index 25a8c32e..1de7f463 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 25a8c32e77692f6ffc5d73136cd6d74cf293e081 +Subproject commit 1de7f4634d468458dce049627685a0342e8f3233 diff --git a/qtrepotools b/qtrepotools index 4712e59d..bb13c8f9 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4712e59d75bb95cb206aff4a6bc111c7c79b06a5 +Subproject commit bb13c8f9ce616e76ef9ec604bb8f26c7a9c00e8d diff --git a/qtspeech b/qtspeech index 66aa85ed..935b2b05 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 66aa85ede203372e3c9eba6c399379fa2f3de43f +Subproject commit 935b2b051ca94dd1dabc5e5f57e77914cd2099f0 diff --git a/qttools b/qttools index 6b37c984..61383cec 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6b37c984fb82a12f0b0e065093f5b180634a9ebe +Subproject commit 61383ceca69001c292b31188b04fba304f8fbbbe diff --git a/qtwebengine b/qtwebengine index 3f501ed2..dde9bbb4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3f501ed2cf4a0a54aeddce9e83effcd8d37c754b +Subproject commit dde9bbb40ceed6409862e4cd31091270f99ea346 diff --git a/qtwebsockets b/qtwebsockets index 71fc4338..ef876a7d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 71fc43384f54b8b1625c22f119b88fb83670b210 +Subproject commit ef876a7d2964f53faf160af2b01798e930dfaa94 From 22f032bd0225777e336828f23dbe69b8e1975127 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 17 Jan 2019 13:54:10 +0200 Subject: [PATCH 08/30] Build qtsaferenderer examples in Windows Task-number: QSR-209 Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017 Reviewed-by: Aapo Keskimolo --- coin/platform_configs/tqtc-qtsaferenderer.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/tqtc-qtsaferenderer.txt b/coin/platform_configs/tqtc-qtsaferenderer.txt index 0391b5d7..0f511b29 100644 --- a/coin/platform_configs/tqtc-qtsaferenderer.txt +++ b/coin/platform_configs/tqtc-qtsaferenderer.txt @@ -2,3 +2,4 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples From e8a1ca05811423513fce574b613162d815bbf230 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 24 Jan 2019 19:30:39 +0000 Subject: [PATCH 09/30] Update submodules on '5.12' in qt5 Change-Id: I6403bd766964d9f65fadfbc514b01eeefdac540e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 77aa17d5..ff362690 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 77aa17d543f09802f1d9eade8ab1278b0fba203f +Subproject commit ff36269001b1e0b13266ac14064657cbe2b0ed34 diff --git a/qtbase b/qtbase index b1092a7d..a905d9d9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b1092a7d4240d419cc2b5f3f5c326a1cb680bbdd +Subproject commit a905d9d91c229ea2760c54e5375ece35aa081b7a diff --git a/qtcharts b/qtcharts index acbd92f9..70baf5bc 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit acbd92f90c139839277a60db84753a102dffbcf2 +Subproject commit 70baf5bc141d022f3cd99216c4628c9e38663d4d diff --git a/qtdatavis3d b/qtdatavis3d index a0e8ef6c..96b5237d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a0e8ef6caf838267811308b668fa76357a1932aa +Subproject commit 96b5237dcd18a0b6f7e34afdde1988797a2d8c5e diff --git a/qtdeclarative b/qtdeclarative index 8fd3cfe7..8ad8a5dd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8fd3cfe7d0f39a731c585334299f5160ad952df9 +Subproject commit 8ad8a5ddec05832c34f0cab3c8cf6530ea6c66c8 diff --git a/qtdoc b/qtdoc index b8e6b128..cc1a7a75 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b8e6b12840066923bedd1eeef1e578eab97d3821 +Subproject commit cc1a7a75ec5d2222230e90a6afb8770dc5810ed6 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 64c479e1..56a4a58c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 64c479e151557343a1ffc684e2ba76c9ef97b1f9 +Subproject commit 56a4a58c999e03385bad6ab052f87ffe2c63500f diff --git a/qtlocation b/qtlocation index b17c07dc..c4aaa11d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b17c07dc0b947c979372fbaf558ce9acc07d1837 +Subproject commit c4aaa11d86d419d1aa216beaaf7424c713b78c8e diff --git a/qtmultimedia b/qtmultimedia index 4e8e4798..67c4ec55 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e8e47989d96f8d60feec2187e4d9c85adb19c2a +Subproject commit 67c4ec55b12c9c397838e3cf3392b66cbd4c142a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fa4b1aa6..28454b50 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fa4b1aa6024f5f3b2d0e0502561b1eaedddd0c78 +Subproject commit 28454b503c7e77a85855e1cc5911908d46d29366 diff --git a/qtserialport b/qtserialport index 1f1fa990..8c4dc36b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 1f1fa990f8d16625d2c6a65aea58a010495cbc77 +Subproject commit 8c4dc36b875ab990454faa9c044e1355ddf6646c diff --git a/qttools b/qttools index a7bac543..9f5f8057 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a7bac5437c59b53887c25b3c0d6ecf0689859c39 +Subproject commit 9f5f80570c91f6da8f558f305c51734768fbec7c diff --git a/qtwayland b/qtwayland index 9fbaa5c1..5f645af2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9fbaa5c13cfb9712273586abbb708eff07df60a5 +Subproject commit 5f645af22bb63f0d215294535cf683029ed7aab5 diff --git a/qtwebchannel b/qtwebchannel index 45bc3ab0..c80cbce7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 45bc3ab0bbc292be26b2bf0596487d9c7f2059d3 +Subproject commit c80cbce7ac3b38a45a38b57795c7eb19e5177a17 diff --git a/qtwebengine b/qtwebengine index 3f7ea91e..a9b6c561 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3f7ea91e23d82e676aeaf157736e25cf54e5ec6b +Subproject commit a9b6c561b0f97ab691b92b791213b22f8cb35b4a diff --git a/qtwebglplugin b/qtwebglplugin index 737aa941..3154a358 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 737aa941f9eeef5979df2b223ad9ae58768bfe2d +Subproject commit 3154a358e2988aa9aafd4ecd8c43c8bcc7c1605f From daf0d3a4c60490ec89766436518fd8c74c4a129e Mon Sep 17 00:00:00 2001 From: Aapo Keskimolo Date: Wed, 23 Jan 2019 23:31:21 +0200 Subject: [PATCH 10/30] Update qtsaferenderer platform configuration definitions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project-specific platform configuration file is renamed to follow the convention as for other projects. This will allow Coin to recognize the configuration that are specific for qtsaferenderer project where they were previously (unintentionally) ignored. Removed QNX 7 as it is in the Qt mainline configuration. Removed Ubuntu 16.04 as Ubuntu 18.04 is now supported. Task-number: QSR-209 Change-Id: I505edc3741dbc047b2fc23bc409016d712596872 Reviewed-by: Tony Sarajärvi --- .../{tqtc-qtsaferenderer.txt => qtsaferenderer.txt} | 2 -- 1 file changed, 2 deletions(-) rename coin/platform_configs/{tqtc-qtsaferenderer.txt => qtsaferenderer.txt} (57%) diff --git a/coin/platform_configs/tqtc-qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt similarity index 57% rename from coin/platform_configs/tqtc-qtsaferenderer.txt rename to coin/platform_configs/qtsaferenderer.txt index 0f511b29..ec14f610 100644 --- a/coin/platform_configs/tqtc-qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,5 +1,3 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples From 92b7d48bc2b6637456e8854de980113a117c7058 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 25 Jan 2019 11:01:57 +0100 Subject: [PATCH 11/30] Windows provisioning: Explicitly state OpenGL configuration to use One of our configurations relied on ANGLE being the default OpenGL configuration on Windows. This is the case at the moment, but might change, so we should not rely on this behavior, but explicitly state the configuration we are expecting. Change-Id: Ie8cb215c2675faf8b514f4d9a43055638be1aaa8 Reviewed-by: Frederik Gladhorn --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index bdc6e816..3959e24a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,6 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic From 1518bfdab6c6e947698499e41d75748a77b6b196 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Jan 2019 15:31:17 +0100 Subject: [PATCH 12/30] Update submodules on '5.12' in qt5 Change-Id: I8060a5f51ae598fa7c8c348cfce212001250941d Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index a905d9d9..4c46e318 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a905d9d91c229ea2760c54e5375ece35aa081b7a +Subproject commit 4c46e3189ac96c8ebcbe1caa47227c4e086d12ff diff --git a/qtconnectivity b/qtconnectivity index 1bba2694..1d964be8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1bba2694302b7200d62d715827f20e8f830d9e03 +Subproject commit 1d964be81b0081d2ccdbf5c9a875672f447b5977 diff --git a/qtdeclarative b/qtdeclarative index 8ad8a5dd..f4ab0ab6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8ad8a5ddec05832c34f0cab3c8cf6530ea6c66c8 +Subproject commit f4ab0ab62496e63db72592845b285bab3d8388b9 diff --git a/qtqa b/qtqa index 1de7f463..7bedbd3b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1de7f4634d468458dce049627685a0342e8f3233 +Subproject commit 7bedbd3bbf6e51f8a360b412c1563fcc0a8e0d80 diff --git a/qttools b/qttools index 9f5f8057..b8931820 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9f5f80570c91f6da8f558f305c51734768fbec7c +Subproject commit b8931820d660457889ee8bbe7ab072ee5ab63adb From f5f03ebfcdc6b18cf6856401f9df891d47ec7945 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Jan 2019 22:44:16 +0100 Subject: [PATCH 13/30] Update submodules on '5.12.1' in qt5 Change-Id: I3ad370f5f6312e22508a37f5618c979b60381987 Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 7d1af8fa..63891267 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9 +Subproject commit 63891267c1fe2e483fa305de9102891448c52981 diff --git a/qtqa b/qtqa index 1de7f463..7bedbd3b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1de7f4634d468458dce049627685a0342e8f3233 +Subproject commit 7bedbd3bbf6e51f8a360b412c1563fcc0a8e0d80 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1157ad6d..ef34964c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1157ad6df74c746e96cadac1ee9a226811f4d084 +Subproject commit ef34964c1fd6ae361da5a6b540f6448cf090e570 From c45f3395ee3c40b210a33626022f72a4e44d4eb9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Jan 2019 04:09:28 +0000 Subject: [PATCH 14/30] Update submodules on '5.12.1' in qt5 Change-Id: I31b89394b870ee1c20d3be5add7fed60e9b23d80 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 63891267..0c498153 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 63891267c1fe2e483fa305de9102891448c52981 +Subproject commit 0c498153331d79715ecfe431eb27065748628ba8 From 6d90dd2191fead089c4677c6be765bc309ef1358 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Jan 2019 09:51:43 +0100 Subject: [PATCH 15/30] Update submodules on '5.12' in qt5 Change-Id: I4fbd3ab3ddb7509366797dde34678d9739229e8d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsvg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index ff362690..a82fdf26 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ff36269001b1e0b13266ac14064657cbe2b0ed34 +Subproject commit a82fdf26ef28bee65b99850a745540b6ba92cbf4 diff --git a/qtbase b/qtbase index 4c46e318..61d50cbc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4c46e3189ac96c8ebcbe1caa47227c4e086d12ff +Subproject commit 61d50cbc96e5331218a6a4e5614f50211f06c718 diff --git a/qtdeclarative b/qtdeclarative index f4ab0ab6..454676a8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f4ab0ab62496e63db72592845b285bab3d8388b9 +Subproject commit 454676a8745a7334539449562a5fda47db2fc2ca diff --git a/qtquickcontrols b/qtquickcontrols index b1b68aa2..d049f759 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b1b68aa279275e93b867c29fa42350f42b9d9728 +Subproject commit d049f759c6f897db528ca549435c56b4420b016e diff --git a/qtscript b/qtscript index 66f1a94a..97ec1d18 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 66f1a94aead9c9b3dacbf91ef763edcda217e56e +Subproject commit 97ec1d1882a83c23c91f0f7daea48e05858d8c32 diff --git a/qtsvg b/qtsvg index ac797c4e..dcc4e2c4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ac797c4e17376b5497e0c37f15b9da48d622d18f +Subproject commit dcc4e2c4d96a6ad1447b9fb679afca21bb381218 From 54cdba9e3dbedcb5567628a29f938fddacba828a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 18 Jan 2019 12:34:45 +0200 Subject: [PATCH 16/30] Provisioning: Remove Unneeded Android variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7dd008aef6465fdddd07e227b48e9b6361c13f81 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/android-openssl.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 4fe5e5ee..cf144c90 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar -Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" -Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" - # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" From 8ba5474da792b2aaa54fcbae46abc440857332ba Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Nov 2018 11:39:44 +0200 Subject: [PATCH 17/30] Provisioning: Install Google's Protocol Buffers Protobuf is needed for Automotive Suite Task-number: QTQAINFRA-2314 Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb Reviewed-by: Samuli Piippo --- .../common/unix/install_protobuff.sh | 75 +++++++++++++++++++ .../common/windows/install-protobuf.ps1 | 64 ++++++++++++++++ .../60-install_protobuff.sh | 40 ++++++++++ .../35-install_protobuff.sh | 40 ++++++++++ .../92-install-protobuf.ps1 | 2 + 5 files changed, 221 insertions(+) create mode 100755 coin/provisioning/common/unix/install_protobuff.sh create mode 100644 coin/provisioning/common/windows/install-protobuf.ps1 create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh new file mode 100755 index 00000000..59e9b699 --- /dev/null +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -0,0 +1,75 @@ +#!/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$ +## +############################################################################# + +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" + +# This script will install Google's Protocal Buffers which is needed by Automotive Suite + +version="3.6.1" +sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip" +externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" + +targetDir="$HOME/protobuf-$version" +targetFile="$targetDir.zip" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +unzip "$targetFile" -d "$HOME" +sudo rm "$targetFile" + +# devtoolset is needed when running configuration +if uname -a |grep -qv "Darwin"; then + export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" +fi + +echo "Configuring and building protobuf" +cd "$targetDir" +if uname -a |grep -q Darwin; then + ./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local" + SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" +else + ./configure +fi +make +sudo make install + +# Refresh shared library cache if OS isn't macOS +if uname -a |grep -qv "Darwin"; then + sudo ldconfig +fi + +sudo rm -r "$targetDir" diff --git a/coin/provisioning/common/windows/install-protobuf.ps1 b/coin/provisioning/common/windows/install-protobuf.ps1 new file mode 100644 index 00000000..fd3fb3d3 --- /dev/null +++ b/coin/provisioning/common/windows/install-protobuf.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## 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 Google's Protocol Buffers +# Script requires Cmake to be installed and strawberry-perl not to be installed + +$version = "3.6.1" +$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" +$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip" +$zip = "C:\Utils\protobuf-all-$version.zip" +$installationFolder = "C:\Utils\protobuf" + +Write-Host "Installing Protocol Buffers" +Add-Path "C:\CMake\bin" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build" +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release" +New-Item -ItemType directory -Force -Path "$installationFolder" +cd "C:\Utils\protobuf-$version\cmake\build\release" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install" +if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){ + Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!" + exit 1 +} + +Remove-Item "$zip" + +Add-Path "$installationFolder\bin" +Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include" +Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh @@ -0,0 +1,40 @@ +#!/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh @@ -0,0 +1,40 @@ +#!/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 new file mode 100644 index 00000000..8bcdf3fa --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-protobuf.ps1" + From 92498bad9c1610779303401eb7b67606e63cdbbb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Jan 2019 12:38:03 +0100 Subject: [PATCH 18/30] Update submodules on '5.12' in qt5 Change-Id: I678bfdb4333abc34a29732aef1816d67f46c09cb Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index a82fdf26..f7e1a38e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a82fdf26ef28bee65b99850a745540b6ba92cbf4 +Subproject commit f7e1a38eb8b548a739e8e67eb7e5e6af3c4c0bc7 diff --git a/qtandroidextras b/qtandroidextras index 82fbed74..dc74de8d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 82fbed7445875678ab4b3d29fed89bbfcbf890fa +Subproject commit dc74de8db874c49c314a2bd475afd5955ae8f83b diff --git a/qtbase b/qtbase index 61d50cbc..8915904e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 61d50cbc96e5331218a6a4e5614f50211f06c718 +Subproject commit 8915904e2a56d46bdedf64f9a7a5e331ae9d00e1 diff --git a/qtdeclarative b/qtdeclarative index 454676a8..a8729cf1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 454676a8745a7334539449562a5fda47db2fc2ca +Subproject commit a8729cf143a79b274c002166476c54dc152c6679 diff --git a/qtgamepad b/qtgamepad index 2826fb63..5de4da55 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2826fb63aa9936388950e90d8255b4b4579e6328 +Subproject commit 5de4da55296a322a598619f6c565072d7460a560 diff --git a/qtlocation b/qtlocation index c4aaa11d..34e7bd9b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c4aaa11d86d419d1aa216beaaf7424c713b78c8e +Subproject commit 34e7bd9bda35783d466dc4dd3cf6157a186f6295 diff --git a/qtmultimedia b/qtmultimedia index 67c4ec55..26ffdc55 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 67c4ec55b12c9c397838e3cf3392b66cbd4c142a +Subproject commit 26ffdc559c78fa5f9b9f5a05f7d6d9b778e711c8 diff --git a/qtqa b/qtqa index 7bedbd3b..db96580c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7bedbd3bbf6e51f8a360b412c1563fcc0a8e0d80 +Subproject commit db96580caaf0e3503a9ab8697f95e8e3b96aa57b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 28454b50..3c32e123 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 28454b503c7e77a85855e1cc5911908d46d29366 +Subproject commit 3c32e1230e3b735e04d8c45cdd1d377a2b693217 diff --git a/qtremoteobjects b/qtremoteobjects index a6df9c84..b0b3cbde 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a6df9c84a667e89bcdf215c7ac21b943b07991bd +Subproject commit b0b3cbde5098986d699c3f6cefe03b852b1f007c diff --git a/qtwebchannel b/qtwebchannel index c80cbce7..38f097ba 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c80cbce7ac3b38a45a38b57795c7eb19e5177a17 +Subproject commit 38f097ba76fe5b26ccc15a5599e312336200e564 diff --git a/qtwebengine b/qtwebengine index a9b6c561..f2bdf9af 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a9b6c561b0f97ab691b92b791213b22f8cb35b4a +Subproject commit f2bdf9af580dd7f8676948c6437b33a01dfc8894 diff --git a/qtwinextras b/qtwinextras index 92720ed8..aab65a4b 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 92720ed84d88d5cf96b958ae4e6ad134421804d0 +Subproject commit aab65a4b855553a906f566d34e4e1d1b41cd0b8c From 3cb745565fefdfdc4e5145290ae34fb00328ebb8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 30 Jan 2019 12:09:34 +0200 Subject: [PATCH 19/30] Provisioning: Renew iOS signing certificates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2690 Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 b70a8a78..d9caff91 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 @@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment.p12" -shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" +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 -iPhoneDistribution="iosdistribution.p12" -shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" +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 From bee2b8cdb92976e80061a750fedb3f8eecf62d6a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 4 Feb 2019 10:52:10 +0100 Subject: [PATCH 20/30] Update submodules on '5.12' in qt5 Change-Id: Ib8b55ed958660be457a7f0852fad9a13d853f1a5 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 8915904e..72b95742 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8915904e2a56d46bdedf64f9a7a5e331ae9d00e1 +Subproject commit 72b95742270afd30a7dda26344892d69fd8f8249 diff --git a/qtdeclarative b/qtdeclarative index a8729cf1..5d8d0d70 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a8729cf143a79b274c002166476c54dc152c6679 +Subproject commit 5d8d0d7068bc8498ea2a6a4c9bc16e0eeb92836c diff --git a/qtlocation b/qtlocation index 34e7bd9b..dc384a23 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 34e7bd9bda35783d466dc4dd3cf6157a186f6295 +Subproject commit dc384a2376a13ae2a8776ea0eda7d6e2fd088a64 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3c32e123..90eb509a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3c32e1230e3b735e04d8c45cdd1d377a2b693217 +Subproject commit 90eb509a6655d25f52edf3ea0da27f83937e5727 diff --git a/qtremoteobjects b/qtremoteobjects index b0b3cbde..d3cde521 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b0b3cbde5098986d699c3f6cefe03b852b1f007c +Subproject commit d3cde521533787f5f91364ffdba3e0a386d131f6 diff --git a/qtrepotools b/qtrepotools index bb13c8f9..21dab1c6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bb13c8f9ce616e76ef9ec604bb8f26c7a9c00e8d +Subproject commit 21dab1c69e16fd8dcfb9564211b31885d628d595 diff --git a/qttools b/qttools index b8931820..d264cde2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b8931820d660457889ee8bbe7ab072ee5ab63adb +Subproject commit d264cde2c754a683a723a2b5aad9b634a07eea21 diff --git a/qtwebengine b/qtwebengine index f2bdf9af..435586ee 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f2bdf9af580dd7f8676948c6437b33a01dfc8894 +Subproject commit 435586eedf983ab9b81291cb8cdfcce28822a0c4 From 4987a682ff1ed37209587462364e979e1ad2d837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 4 Feb 2019 12:49:06 +0200 Subject: [PATCH 21/30] Make qt3d-runtime.txt platform configuration a link The content of qt3d-runtime.txt should always be the same as qt5.txt. Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78 Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) mode change 100644 => 120000 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 100644 index 5a189f25..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1,22 +0,0 @@ -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-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 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 diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 120000 index 00000000..9b3b4cd8 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1 @@ +qt5.txt \ No newline at end of file From 4f7c2120a7adfa600a875b43f789a46c43b09ab0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Feb 2019 09:41:27 +0100 Subject: [PATCH 22/30] Update submodules on '5.12' in qt5 Change-Id: Ia0b08ce2f5513e78cffa4679d7465a30c95de8e4 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 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/qt3d b/qt3d index f7e1a38e..3c68eeac 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f7e1a38eb8b548a739e8e67eb7e5e6af3c4c0bc7 +Subproject commit 3c68eeac236b2e33cf34d2f23e04a8d156118eb0 diff --git a/qtactiveqt b/qtactiveqt index abc831d8..4766c93e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit abc831d8dfed32167d8ea67071b3f36284bec299 +Subproject commit 4766c93e4df91ee3ecf510b5f011799e29f6093e diff --git a/qtandroidextras b/qtandroidextras index dc74de8d..1c7de170 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit dc74de8db874c49c314a2bd475afd5955ae8f83b +Subproject commit 1c7de1701f1f75c2ce6cfff1baa6ab49ee669073 diff --git a/qtbase b/qtbase index 72b95742..850c9220 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 72b95742270afd30a7dda26344892d69fd8f8249 +Subproject commit 850c922036b7eebc24cdb74a43a4b31319d924c7 diff --git a/qtcanvas3d b/qtcanvas3d index 31446427..18e0ed4f 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 314464271ca5d10db37b7bb2f1b52e6c003e4197 +Subproject commit 18e0ed4fecb9642464c989a6c716a2b5cf400108 diff --git a/qtcharts b/qtcharts index 70baf5bc..9da68921 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 70baf5bc141d022f3cd99216c4628c9e38663d4d +Subproject commit 9da68921e4bfb9c362600832b23128d488dc7aff diff --git a/qtconnectivity b/qtconnectivity index 1d964be8..370e84c6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1d964be81b0081d2ccdbf5c9a875672f447b5977 +Subproject commit 370e84c6d5f7c4f2d3f274ccb250f4baccd4614d diff --git a/qtdatavis3d b/qtdatavis3d index 96b5237d..54adef94 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 96b5237dcd18a0b6f7e34afdde1988797a2d8c5e +Subproject commit 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 diff --git a/qtdeclarative b/qtdeclarative index 5d8d0d70..d27d896d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5d8d0d7068bc8498ea2a6a4c9bc16e0eeb92836c +Subproject commit d27d896d8cb9d240138fe8ea69f1051f74ce1945 diff --git a/qtdoc b/qtdoc index cc1a7a75..2e9adec0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cc1a7a75ec5d2222230e90a6afb8770dc5810ed6 +Subproject commit 2e9adec0f0d929d971d3da1c7f1f170930fc7ae0 diff --git a/qtgamepad b/qtgamepad index 5de4da55..8dd9ee5e 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 5de4da55296a322a598619f6c565072d7460a560 +Subproject commit 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39 diff --git a/qtimageformats b/qtimageformats index 50f66981..0e8422be 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 50f6698117c2259bdd78868620908eec79e09561 +Subproject commit 0e8422bedc8c84ff7c08c6b3163329e82c2007dd diff --git a/qtmacextras b/qtmacextras index c8d6f787..18594a39 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit c8d6f78710198afb83dfac1af3c8026eabed1cca +Subproject commit 18594a3928dbc82597cf6d9fb90ca07d2a67bcb1 diff --git a/qtmultimedia b/qtmultimedia index 26ffdc55..dee506f7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 26ffdc559c78fa5f9b9f5a05f7d6d9b778e711c8 +Subproject commit dee506f70536dd10f3e00c42f685ead9283433b9 diff --git a/qtnetworkauth b/qtnetworkauth index c4ac0d51..2d58e369 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c4ac0d51133be25aace898b357a6744094d20125 +Subproject commit 2d58e369ed692c8a7e639919d15ff6299a76f810 diff --git a/qtpurchasing b/qtpurchasing index 4e7e9fc7..7f9e30e2 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4e7e9fc7bcc97e9278b25ecb35e6798c2ca229d6 +Subproject commit 7f9e30e242a7ba02501f24eb9ff7fdb3028783ec diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 90eb509a..1d29b1e3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 90eb509a6655d25f52edf3ea0da27f83937e5727 +Subproject commit 1d29b1e36732a7d17ed34c5fa207e7b935f2f41d diff --git a/qtscript b/qtscript index 97ec1d18..5a9de40f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 97ec1d1882a83c23c91f0f7daea48e05858d8c32 +Subproject commit 5a9de40f48f5854b6ff20329ced0f0509b81b48a diff --git a/qtscxml b/qtscxml index f167b3cd..01399f96 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f167b3cdb61a0bd51360d9736f23e99e5ae0c860 +Subproject commit 01399f9600174a0c77ffc57d32c07ce0698952e1 diff --git a/qtsensors b/qtsensors index b6a72a46..7792137f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b6a72a463203cf8cdd03cd9ea135ea396ec2ed42 +Subproject commit 7792137f3fcd400f3933e8f7f328b35aa0586f81 diff --git a/qtserialbus b/qtserialbus index 59f4eed6..670f912f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 59f4eed65ab9730162ddf5b1d5c1ac260024a361 +Subproject commit 670f912fbc08002ac063504755fc7705931e0d6e diff --git a/qtserialport b/qtserialport index 8c4dc36b..b43e8fa2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8c4dc36b875ab990454faa9c044e1355ddf6646c +Subproject commit b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 diff --git a/qtspeech b/qtspeech index 42000618..0711336d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 420006184c2e38bf21d466f167b64fe149b63a1a +Subproject commit 0711336d26804898393a99640e1442df7fd3828c diff --git a/qtsvg b/qtsvg index dcc4e2c4..74f75665 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit dcc4e2c4d96a6ad1447b9fb679afca21bb381218 +Subproject commit 74f7566527c6ed3c47fac873e90942f2834d248f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d08539ba..c099fef8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d08539bae35521bbd7ee60958b4492705efe5b3f +Subproject commit c099fef8041f6cfd56e789b86c70a802c894da34 diff --git a/qtwebchannel b/qtwebchannel index 38f097ba..d14c6aa5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 38f097ba76fe5b26ccc15a5599e312336200e564 +Subproject commit d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 diff --git a/qtwebengine b/qtwebengine index 435586ee..31730085 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 435586eedf983ab9b81291cb8cdfcce28822a0c4 +Subproject commit 31730085ee9247864a5da5682939eb399853f984 diff --git a/qtwebsockets b/qtwebsockets index 58dc0949..9a0a655b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 58dc09497d2fb580cf5e356bef91b0dc61ae81b7 +Subproject commit 9a0a655b51086045ce86c9d001d34738d84d27ff diff --git a/qtwebview b/qtwebview index 161e4ec3..17334eb5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 161e4ec3af7d6c952f1a4b3c44ec6722dc1c0a18 +Subproject commit 17334eb56b42114927169ee8eec6512754674fb2 diff --git a/qtwinextras b/qtwinextras index aab65a4b..f2dc1d1a 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit aab65a4b855553a906f566d34e4e1d1b41cd0b8c +Subproject commit f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 diff --git a/qtx11extras b/qtx11extras index d5a574ec..16528689 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d5a574ec945cce6f53232c53030d9b3b691f9032 +Subproject commit 165286899e3426730e5dfcd155f92b571c978416 diff --git a/qtxmlpatterns b/qtxmlpatterns index 79984891..5e2450f4 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 79984891427743dfb16df056ecee56384024e93e +Subproject commit 5e2450f4559f03a480e37318084bab99fdc128fc From 9df51884939eb79301666547c2e0d24c744b5c5f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Feb 2019 15:46:34 +0100 Subject: [PATCH 23/30] Update submodules on '5.12' in qt5 Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 3c68eeac..a7e5adde 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3c68eeac236b2e33cf34d2f23e04a8d156118eb0 +Subproject commit a7e5adde24a9f79c121f8f9427fde487395bf40a diff --git a/qtbase b/qtbase index 850c9220..ddb5d390 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 850c922036b7eebc24cdb74a43a4b31319d924c7 +Subproject commit ddb5d390450de25e510c72b17ed8124b9186a736 diff --git a/qtdeclarative b/qtdeclarative index d27d896d..89530282 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d27d896d8cb9d240138fe8ea69f1051f74ce1945 +Subproject commit 895302829b46e00cde8eef13eb7c630af5d771e2 diff --git a/qtdoc b/qtdoc index 2e9adec0..0661dfc0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2e9adec0f0d929d971d3da1c7f1f170930fc7ae0 +Subproject commit 0661dfc0bd89dd88ffd58c01bfce07d0de0f0eb2 diff --git a/qtlocation b/qtlocation index dc384a23..0481a568 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit dc384a2376a13ae2a8776ea0eda7d6e2fd088a64 +Subproject commit 0481a5680622a3c75f41aab96a2afb48b0d6001e diff --git a/qtmultimedia b/qtmultimedia index dee506f7..86172a75 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dee506f70536dd10f3e00c42f685ead9283433b9 +Subproject commit 86172a759d40b0dc6dc664ba79581bf315526788 diff --git a/qtpurchasing b/qtpurchasing index 7f9e30e2..dff997ec 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 7f9e30e242a7ba02501f24eb9ff7fdb3028783ec +Subproject commit dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 diff --git a/qtquickcontrols b/qtquickcontrols index d049f759..65d61277 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d049f759c6f897db528ca549435c56b4420b016e +Subproject commit 65d61277be164a0781f9b57873afc000f36073fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1d29b1e3..4e5601ac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1d29b1e36732a7d17ed34c5fa207e7b935f2f41d +Subproject commit 4e5601ac1c7aec6aba9ba09fe7adb7a0462da2f0 diff --git a/qtremoteobjects b/qtremoteobjects index d3cde521..08f12f69 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d3cde521533787f5f91364ffdba3e0a386d131f6 +Subproject commit 08f12f69b19ba3a893feeb71d289e807fe051b8e diff --git a/qtrepotools b/qtrepotools index 21dab1c6..f9c6da38 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 21dab1c69e16fd8dcfb9564211b31885d628d595 +Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 diff --git a/qtsvg b/qtsvg index 74f75665..a91a6563 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 74f7566527c6ed3c47fac873e90942f2834d248f +Subproject commit a91a65632c4d830070e1ca9bbda7e355f1459414 diff --git a/qttools b/qttools index d264cde2..536c58c5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d264cde2c754a683a723a2b5aad9b634a07eea21 +Subproject commit 536c58c55641f2b93c95aa38d2893385f412786d diff --git a/qtwebengine b/qtwebengine index 31730085..68733d4f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 31730085ee9247864a5da5682939eb399853f984 +Subproject commit 68733d4fb913255fba47b1f7190cf85ad57e6541 From ef7908d90cd4acfd3dc9ddeb5dca4e9d53dde9d8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Feb 2019 20:49:49 +0100 Subject: [PATCH 24/30] Update submodules on '5.12' in qt5 Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index ddb5d390..74e04d6a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ddb5d390450de25e510c72b17ed8124b9186a736 +Subproject commit 74e04d6ace7aa949db97ae2e46c38a4dc0d4d36a diff --git a/qtconnectivity b/qtconnectivity index 370e84c6..7accd344 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 370e84c6d5f7c4f2d3f274ccb250f4baccd4614d +Subproject commit 7accd34495a8269f9b335446ae779bd56cd4c4c0 diff --git a/qtdeclarative b/qtdeclarative index 89530282..bb2dce1d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 895302829b46e00cde8eef13eb7c630af5d771e2 +Subproject commit bb2dce1d902405acfd5aaf997860c0f0318bce77 diff --git a/qtwayland b/qtwayland index 5f645af2..2824a71e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5f645af22bb63f0d215294535cf683029ed7aab5 +Subproject commit 2824a71e5c28ec1843edc056f2c17c6274378f1d From f64ba39ce54a3d4a63d527ccb922ec59457cfb52 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Feb 2019 18:14:50 +0100 Subject: [PATCH 25/30] Update submodules on '5.12' in qt5 Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index a7e5adde..52c3f9ab 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a7e5adde24a9f79c121f8f9427fde487395bf40a +Subproject commit 52c3f9ab735bf0dfe611402ea456afc56ccdeb37 diff --git a/qtbase b/qtbase index 74e04d6a..035d8040 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 74e04d6ace7aa949db97ae2e46c38a4dc0d4d36a +Subproject commit 035d80407b693662c209cd4f156085d583ad428c diff --git a/qtconnectivity b/qtconnectivity index 7accd344..1606ccb7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7accd34495a8269f9b335446ae779bd56cd4c4c0 +Subproject commit 1606ccb76ba72990df652fbd7f01d709ae20b63c diff --git a/qtdeclarative b/qtdeclarative index bb2dce1d..734f5a31 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bb2dce1d902405acfd5aaf997860c0f0318bce77 +Subproject commit 734f5a31c7a72d87a99103051ed327addae0ab99 diff --git a/qtmultimedia b/qtmultimedia index 86172a75..a8ebc9c9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 86172a759d40b0dc6dc664ba79581bf315526788 +Subproject commit a8ebc9c9fd746bd6c269fa61145d53faafecdbd5 diff --git a/qtqa b/qtqa index db96580c..0797a581 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit db96580caaf0e3503a9ab8697f95e8e3b96aa57b +Subproject commit 0797a58105d77a9c4fbb1212eb376ca487d80f81 diff --git a/qtwebengine b/qtwebengine index 68733d4f..b3872ab2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 68733d4fb913255fba47b1f7190cf85ad57e6541 +Subproject commit b3872ab2bb94b70e3f43cdf4217d959b95815d26 From 2dff8afa987117b703bc0f9423f7227c0853e22e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 Feb 2019 23:08:07 +0100 Subject: [PATCH 26/30] Update submodules on '5.12' in qt5 Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 035d8040..9f22ac0a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 035d80407b693662c209cd4f156085d583ad428c +Subproject commit 9f22ac0aa0254f20f9b26aec7b124d74141fdfcd diff --git a/qtdeclarative b/qtdeclarative index 734f5a31..a804f31e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 734f5a31c7a72d87a99103051ed327addae0ab99 +Subproject commit a804f31ee2665501c1894cbae8302db181090bd5 diff --git a/qtmultimedia b/qtmultimedia index a8ebc9c9..a7f01cea 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a8ebc9c9fd746bd6c269fa61145d53faafecdbd5 +Subproject commit a7f01cea43a16a9b2b06ab3a8ff3b62b8edce5cd diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4e5601ac..579422fa 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4e5601ac1c7aec6aba9ba09fe7adb7a0462da2f0 +Subproject commit 579422faaad76b12341a725320da65fcabb3cf7b diff --git a/qtremoteobjects b/qtremoteobjects index 08f12f69..5f941451 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 08f12f69b19ba3a893feeb71d289e807fe051b8e +Subproject commit 5f94145128035bce167ca23780296564aa5f25d1 diff --git a/qttools b/qttools index 536c58c5..802aa37f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 536c58c55641f2b93c95aa38d2893385f412786d +Subproject commit 802aa37f7725ca3d75d1e928d845c6df534943ba diff --git a/qttranslations b/qttranslations index 6431236b..c8a0da51 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6431236ba6506c0eb9263e2b14d8b84d7716b12c +Subproject commit c8a0da51adcc015447fc26e5a2b3d1de12479f75 diff --git a/qtwebengine b/qtwebengine index b3872ab2..89ebafdb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b3872ab2bb94b70e3f43cdf4217d959b95815d26 +Subproject commit 89ebafdb6c41229f007d423aa785dea6ace07271 From 80deae9b74d1cfc0717767c882f654be8ae67b05 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 22 Jan 2019 11:54:55 +0200 Subject: [PATCH 27/30] Fix provisioning script dxsdk.ps1 Due to typo in dxsdk.ps1 provisioning script, it did not download from cached location. Also checksum Check was missing. Task-number: QTQAINFRA-2614 Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/dxsdk.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/windows/dxsdk.ps1 b/coin/provisioning/common/windows/dxsdk.ps1 index ce2bbeb3..f796ae1d 100644 --- a/coin/provisioning/common/windows/dxsdk.ps1 +++ b/coin/provisioning/common/windows/dxsdk.ps1 @@ -4,16 +4,16 @@ $package = "DXSDK_Jun10.exe" -$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" -$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" -$exe = "C:\Windows\Temp\$package" - -Download $officialUrl $cachedUrl $exe +$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69" +$package_path = "C:\Windows\Temp\$package" +Download $officialUrl $cachedUrl $package_path +Verify-Checksum $package_path $sdkChecksumSha1 sha1 Write-Host "Installing DirectX SDK" -Run-Executable $exe "/u" +Run-Executable $package_path "/u" -Remove-Item -Path $exe +Remove-Item -Path $package_path Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt From 6967ec6b7333c56fbd9fb4387fe8edc7d1e05d7a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Feb 2019 19:05:59 +0100 Subject: [PATCH 28/30] Update submodules on '5.12' in qt5 Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 52c3f9ab..efa4665b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 52c3f9ab735bf0dfe611402ea456afc56ccdeb37 +Subproject commit efa4665b316dbd5361b0936a1135f45c141f14aa diff --git a/qtbase b/qtbase index 9f22ac0a..c4e9eabc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9f22ac0aa0254f20f9b26aec7b124d74141fdfcd +Subproject commit c4e9eabc309a275efc222f4127f31ba4677259b7 diff --git a/qtdeclarative b/qtdeclarative index a804f31e..91a71bce 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a804f31ee2665501c1894cbae8302db181090bd5 +Subproject commit 91a71bce9c633934540e9f06fb081e3b89259ff3 diff --git a/qtdoc b/qtdoc index 0661dfc0..81200196 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0661dfc0bd89dd88ffd58c01bfce07d0de0f0eb2 +Subproject commit 81200196ada801601c6c973643d2962be5a88ba7 diff --git a/qtlocation b/qtlocation index 0481a568..633b0f40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0481a5680622a3c75f41aab96a2afb48b0d6001e +Subproject commit 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 diff --git a/qtnetworkauth b/qtnetworkauth index 2d58e369..83633211 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2d58e369ed692c8a7e639919d15ff6299a76f810 +Subproject commit 8363321174f64a1497952d2d7fec895a2a7e18f3 diff --git a/qttools b/qttools index 802aa37f..b7decf54 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 802aa37f7725ca3d75d1e928d845c6df534943ba +Subproject commit b7decf54170ce71811bcbc13526e31914b0498e9 diff --git a/qtwayland b/qtwayland index 2824a71e..4b58ff21 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2824a71e5c28ec1843edc056f2c17c6274378f1d +Subproject commit 4b58ff21f4a3c629867064289b6c778bbb57f95a diff --git a/qtwebglplugin b/qtwebglplugin index 3154a358..b1662da5 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 3154a358e2988aa9aafd4ecd8c43c8bcc7c1605f +Subproject commit b1662da58d05dd53b5d4c84a3518c65f417cefd8 From 391ba3a9ca2c75c0229789c8f4f5e838da53b21f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Feb 2019 21:36:10 +0100 Subject: [PATCH 29/30] Update submodules on '5.12' in qt5 Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtscxml | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index c4e9eabc..4b4a288f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c4e9eabc309a275efc222f4127f31ba4677259b7 +Subproject commit 4b4a288f5f88077d647d47e9bdd911edf6cdca72 diff --git a/qtdeclarative b/qtdeclarative index 91a71bce..1e3ed172 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 91a71bce9c633934540e9f06fb081e3b89259ff3 +Subproject commit 1e3ed172f35abaa0e0af43ee22259bc3cd188ad8 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/qtscxml b/qtscxml index 01399f96..dca1cd7c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01399f9600174a0c77ffc57d32c07ce0698952e1 +Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 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 1c6f272dd0a0a43af85428efbe6d640a7a9803f6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Feb 2019 19:26:49 +0100 Subject: [PATCH 30/30] Update submodules on '5.12' in qt5 Change-Id: Ia2c669226e73a545a19c941c5672972a92049534 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index efa4665b..7f9fdca7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit efa4665b316dbd5361b0936a1135f45c141f14aa +Subproject commit 7f9fdca73a17060b9d69db00b5d480690dcae935 diff --git a/qtbase b/qtbase index 4b4a288f..501cca2c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4b4a288f5f88077d647d47e9bdd911edf6cdca72 +Subproject commit 501cca2c4b0851cea7133ba56c3a05d71c25ce6d diff --git a/qtdeclarative b/qtdeclarative index 1e3ed172..d96a700c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1e3ed172f35abaa0e0af43ee22259bc3cd188ad8 +Subproject commit d96a700cc3611480ff76023287cb06f455a37b02 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/qtqa b/qtqa index 0797a581..50586f55 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0797a58105d77a9c4fbb1212eb376ca487d80f81 +Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 579422fa..0614d792 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 579422faaad76b12341a725320da65fcabb3cf7b +Subproject commit 0614d792967b7721c692cb273bb5428544fa3680 diff --git a/qtwebengine b/qtwebengine index 3e88b4d3..74d2d301 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e +Subproject commit 74d2d301b11f2edfde69f0515e2fd74882ab6dab