From 05c1f1cf9917f0c59968e91edd8262aa6932a3c1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Jan 2019 20:33:44 +0100 Subject: 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 -- cgit v1.2.3 From 0f8243bce8db8233fbc8cf7b1e39a66135215d62 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 8 Jan 2019 13:35:16 +0100 Subject: 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 -- cgit v1.2.3 From 5256ac9c60e571349313053e4c9b73ca5d394fb5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Jan 2019 15:44:46 +0100 Subject: 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 -- cgit v1.2.3 From 616178cfb28b3896d19d6cdc56eee44d362ba472 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 Jan 2019 22:34:33 +0100 Subject: 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 -- cgit v1.2.3 From da3ffbea171e476d8db104e0c42dcd3615377052 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 Jan 2019 05:29:33 +0000 Subject: 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 -- cgit v1.2.3 From 3855853e341c81253a58d03f233e133be5dc42de Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 13 Jan 2019 22:16:09 +0100 Subject: 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 -- cgit v1.2.3 From 017d9e2ee3592ee86697bbcd34854d73793b1811 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 Jan 2019 04:13:08 +0000 Subject: 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 -- cgit v1.2.3 From 22f032bd0225777e336828f23dbe69b8e1975127 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 17 Jan 2019 13:54:10 +0200 Subject: 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 -- cgit v1.2.3 From e8a1ca05811423513fce574b613162d815bbf230 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 24 Jan 2019 19:30:39 +0000 Subject: 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 -- cgit v1.2.3 From daf0d3a4c60490ec89766436518fd8c74c4a129e Mon Sep 17 00:00:00 2001 From: Aapo Keskimolo Date: Wed, 23 Jan 2019 23:31:21 +0200 Subject: 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 --- coin/platform_configs/qtsaferenderer.txt | 3 +++ coin/platform_configs/tqtc-qtsaferenderer.txt | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 coin/platform_configs/qtsaferenderer.txt delete mode 100644 coin/platform_configs/tqtc-qtsaferenderer.txt diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt new file mode 100644 index 00000000..ec14f610 --- /dev/null +++ b/coin/platform_configs/qtsaferenderer.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples diff --git a/coin/platform_configs/tqtc-qtsaferenderer.txt b/coin/platform_configs/tqtc-qtsaferenderer.txt deleted file mode 100644 index 0f511b29..00000000 --- a/coin/platform_configs/tqtc-qtsaferenderer.txt +++ /dev/null @@ -1,5 +0,0 @@ -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 -- cgit v1.2.3 From 92b7d48bc2b6637456e8854de980113a117c7058 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 25 Jan 2019 11:01:57 +0100 Subject: 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 -- cgit v1.2.3 From 1518bfdab6c6e947698499e41d75748a77b6b196 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Jan 2019 15:31:17 +0100 Subject: 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 -- cgit v1.2.3 From f5f03ebfcdc6b18cf6856401f9df891d47ec7945 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Jan 2019 22:44:16 +0100 Subject: 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 -- cgit v1.2.3 From 3793e0ddfcdead348afa62938f71d5e341651643 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 28 Jan 2019 14:37:50 +0100 Subject: Adjust submodule branches --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 762ce50a..acfa2616 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.13 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.13 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.13 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.13 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.13 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.13 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 5.13 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.13 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.13 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.13 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.13 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.13 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.13 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.13 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.13 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.13 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.13 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.13 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.13 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.13 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.13 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.13 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.13 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.13 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.13 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.13 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.13 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,86 +229,86 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.13 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.13 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.13 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.13 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.13 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.13 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = 5.13 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 5.13 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = 5.13 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 5.13 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 5.13 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = 5.13 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = 5.13 status = preview -- cgit v1.2.3 From c45f3395ee3c40b210a33626022f72a4e44d4eb9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Jan 2019 04:09:28 +0000 Subject: 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 -- cgit v1.2.3 From 6d90dd2191fead089c4677c6be765bc309ef1358 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Jan 2019 09:51:43 +0100 Subject: 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 -- cgit v1.2.3 From 54cdba9e3dbedcb5567628a29f938fddacba828a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 18 Jan 2019 12:34:45 +0200 Subject: 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" -- cgit v1.2.3 From 8ba5474da792b2aaa54fcbae46abc440857332ba Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Nov 2018 11:39:44 +0200 Subject: Provisioning: Install Google's Protocol Buffers Protobuf is needed for Automotive Suite Task-number: QTQAINFRA-2314 Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb Reviewed-by: Samuli Piippo --- coin/provisioning/common/unix/install_protobuff.sh | 75 ++++++++++++++++++++++ .../common/windows/install-protobuf.ps1 | 64 ++++++++++++++++++ .../60-install_protobuff.sh | 40 ++++++++++++ .../35-install_protobuff.sh | 40 ++++++++++++ .../qtci-windows-10-x86_64/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" + -- cgit v1.2.3 From 92498bad9c1610779303401eb7b67606e63cdbbb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Jan 2019 12:38:03 +0100 Subject: 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 -- cgit v1.2.3 From 3cb745565fefdfdc4e5145290ae34fb00328ebb8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 30 Jan 2019 12:09:34 +0200 Subject: 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 -- cgit v1.2.3 From bee2b8cdb92976e80061a750fedb3f8eecf62d6a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 4 Feb 2019 10:52:10 +0100 Subject: 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 -- cgit v1.2.3 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: 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 -- cgit v1.2.3 From 4f7c2120a7adfa600a875b43f789a46c43b09ab0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Feb 2019 09:41:27 +0100 Subject: 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 -- cgit v1.2.3 From 73f1d0f518f28fd4db27c3e2517d3448d0ba6b65 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Feb 2019 21:11:22 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I9fbaaaf4870edefceb1a4557799c41077002aaa0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index b0e11393..bf40a6cb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b0e11393968ceaad8c35e7df528c73a5e6111f32 +Subproject commit bf40a6cbf6b0045c157431f2717697c37bd20697 diff --git a/qtactiveqt b/qtactiveqt index ea840c39..df68df84 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ea840c39b3592035210aea42b225410079b7626a +Subproject commit df68df8489d393a5800a0a183b6151ec0342662e diff --git a/qtandroidextras b/qtandroidextras index 83a481c4..babd689a 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 83a481c4e2946fed7c072cdc971370cd2ac5591f +Subproject commit babd689a4a564e1d2b5cdfff67c0bdf7f48ede90 diff --git a/qtbase b/qtbase index fe29a6a6..ae44da62 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fe29a6a6ebbf28505df7cdf1de24fa540fd3745e +Subproject commit ae44da62ef30503a5380e5d1ee8b0cadd5960994 diff --git a/qtcharts b/qtcharts index d63f5bd2..1347a8ea 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d63f5bd20034812b7661d6f2beb7f0025333953d +Subproject commit 1347a8ea80373ba3f5859ad2381c514526d3faa4 diff --git a/qtconnectivity b/qtconnectivity index 18b57342..005cef90 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 18b57342a009b310c280feeaec3d7cf9f6b98dcb +Subproject commit 005cef90c6e06ef419dcec8f4619402677470301 diff --git a/qtdatavis3d b/qtdatavis3d index 4a86aa52..7d7038d4 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4a86aa5243c7f0bde37fe6094ecb4bc7a9da1721 +Subproject commit 7d7038d47a72cd203785080e997458f0d44f5e15 diff --git a/qtdeclarative b/qtdeclarative index 5050a6e9..6a7c8749 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5050a6e9cd80dee723b62bba8160ffe7b0ec6b01 +Subproject commit 6a7c8749712c33e27cdbc93efdf54eddf8e7631f diff --git a/qtdoc b/qtdoc index 5b1d9d4e..414918dd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5b1d9d4e0dec818f9d535603a8b6cab98194e143 +Subproject commit 414918dd0c5b7c4334bcb51c8a9d2fdc9be61c8a diff --git a/qtgamepad b/qtgamepad index 1d664811..419bc7bc 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 1d664811805984e58cc44d4553c700d51389c389 +Subproject commit 419bc7bc6e469ac88522ee9dabcf36ac1c66280c diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 29e31fad..0fc226b3 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 29e31fad480e097d7cca121c44fc16028ac3ffa9 +Subproject commit 0fc226b32789adee140951c63739da65a081d211 diff --git a/qtimageformats b/qtimageformats index 750f359f..5904479f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 750f359fd7aa47775abefce2d2aa8ec423745622 +Subproject commit 5904479f50ccafc9556475b4e039d707eadc58b7 diff --git a/qtlocation b/qtlocation index 1afc3744..7a65e5f2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1afc3744c33b67c29361e7300641c4e7212702fb +Subproject commit 7a65e5f2b9d5ecda418e76f98acd90506025186a diff --git a/qtlottie b/qtlottie index 7648d428..a53d7c01 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 7648d428cd7316d490ab5739ac9516edde442467 +Subproject commit a53d7c014d68988a94e0be3219736a5dc266e1fb diff --git a/qtmacextras b/qtmacextras index dd24538f..57c10f82 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit dd24538f3e020d8ad6b4fdb7b4641f4421bc61e6 +Subproject commit 57c10f82725d3468fc0027b694601300a7c169bb diff --git a/qtmultimedia b/qtmultimedia index 94921e0f..26830d43 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 94921e0fd8b9904e7472ae9546fa82e3eca55407 +Subproject commit 26830d435d942ce580dfe17209563c47eb3da722 diff --git a/qtnetworkauth b/qtnetworkauth index 8b881885..a0d04006 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8b881885c10d60c636fd777d973e60a75ab9a802 +Subproject commit a0d040060f6ff1a4db87498afdcf85ce46de0d81 diff --git a/qtpurchasing b/qtpurchasing index f1812309..4c45534f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f1812309c36ce1e2a7c6b59381424b803cf37068 +Subproject commit 4c45534f40d963142ee4ac957679776b72c098b0 diff --git a/qtqa b/qtqa index 1de7f463..db96580c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1de7f4634d468458dce049627685a0342e8f3233 +Subproject commit db96580caaf0e3503a9ab8697f95e8e3b96aa57b diff --git a/qtquickcontrols b/qtquickcontrols index 4f28f1c2..352aeb96 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4f28f1c27ae17146348ae3b262f8f0036dd70c62 +Subproject commit 352aeb96a52590aff91e3f6a1e03c65418d596d3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index efa04c2a..3afec43b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit efa04c2ae8427c70848477ace3d8f6e82baaab11 +Subproject commit 3afec43b69991753416380d88e22b5382b8b0832 diff --git a/qtremoteobjects b/qtremoteobjects index 00b89659..2a14e88f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 00b89659758ab852a5a6fc18d3f211055f760212 +Subproject commit 2a14e88f548fbc20537ed9a2736c2e058a1d59af diff --git a/qtrepotools b/qtrepotools index 4712e59d..21dab1c6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4712e59d75bb95cb206aff4a6bc111c7c79b06a5 +Subproject commit 21dab1c69e16fd8dcfb9564211b31885d628d595 diff --git a/qtscript b/qtscript index 3cc9fe5d..e0c1663b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3cc9fe5db038ee465f97603f94cbbb64979d8c0b +Subproject commit e0c1663b87126f58613c846b56dc1e69e4e06404 diff --git a/qtscxml b/qtscxml index 75452375..2d83e09f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7545237546f620d09d37f30cb74d18083b868e54 +Subproject commit 2d83e09f9d6ca4d604571d7989a359381e6c93ff diff --git a/qtsensors b/qtsensors index 37233436..1579f198 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 37233436a5d01405dc93ebcfc90cb1a77ce206c1 +Subproject commit 1579f19830443484c4c51d6924a5b141b4e816e4 diff --git a/qtserialbus b/qtserialbus index a4cf47dd..81a50f7c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a4cf47ddfbfde719429ecd1c06bbb4b948cc9b9d +Subproject commit 81a50f7c45cdaa88668a953d40f67d6809b2b16a diff --git a/qtserialport b/qtserialport index b9da7701..dc70c4c6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b9da7701d6f5ee454d138d02b983909e4f6a2077 +Subproject commit dc70c4c650b9a0ece63bb8334d1b4e7d7b09818e diff --git a/qtspeech b/qtspeech index 6c8238d9..4a972ad8 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 6c8238d94f0eb9d4f14b6428efe709a53d3e018f +Subproject commit 4a972ad8027b2e4845a8a3ac3f119dc0f3b05407 diff --git a/qtsvg b/qtsvg index 8571c19b..fbad8e77 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8571c19b95c62dc17a1ade1ecf49c615ea386a26 +Subproject commit fbad8e7701708c07bfbae73e6c3158fd9e560ee7 diff --git a/qttools b/qttools index a83e01ef..b3c9f6cb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a83e01ef571fa26e2b76dcfe33027da6f95cfb76 +Subproject commit b3c9f6cb9eb104bf4fe86b377aee7875473f97b4 diff --git a/qttranslations b/qttranslations index 812d36d5..f9b9f475 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 812d36d5f4f7e4858fecd23e18133b21a280dabf +Subproject commit f9b9f4753ca8cd4ef978e61db6125b9fba668c0e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d7261893..d54d3f3b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d72618934d83cb15e4f8116803f02e2e0d4e2cc8 +Subproject commit d54d3f3bd2e7dfd803ce8d97672934820edb0641 diff --git a/qtwayland b/qtwayland index 017e1fa0..401bdeca 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 017e1fa058d133ff4943907bd97822344183a619 +Subproject commit 401bdecabb950001ae3294e864ed397d1b76b3f4 diff --git a/qtwebchannel b/qtwebchannel index ba94889c..7fa4cf25 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ba94889c325841c244f401f68267d0450d3ca444 +Subproject commit 7fa4cf258af693f0fe61e5006ad83a91c63a45df diff --git a/qtwebengine b/qtwebengine index 0763b7c4..5e92adf5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0763b7c40d3490250f5bca1e0029cefba635305c +Subproject commit 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 diff --git a/qtwebglplugin b/qtwebglplugin index 9a159605..d5ed6b5c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9a1596059d40789f7909e44705d2323bbeb263fe +Subproject commit d5ed6b5cfd8b8af6c9396a1234df1633aa22dbd8 diff --git a/qtwebsockets b/qtwebsockets index 192a5ec7..3b925727 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 192a5ec7e93b15c931ac479abf400dc371697ef6 +Subproject commit 3b925727801483809c963acb7df08dae0f3d0e8a diff --git a/qtwebview b/qtwebview index f2e136c1..b9864e03 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f2e136c1a16bf2fe3a9ebe392fddd34ad83caede +Subproject commit b9864e03bec6753b0407e8ba784b15bb4394362c diff --git a/qtwinextras b/qtwinextras index 5cdbe613..4b745cf6 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5cdbe6132f864d0453a9b6a25b6bc511ae48ffcd +Subproject commit 4b745cf6111e2b164cd85d8aa30bef8ee7339f9a diff --git a/qtx11extras b/qtx11extras index 3ea03029..e0b62282 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 3ea03029664273be39c7fb5f72330c1a93387416 +Subproject commit e0b62282231888028c520efc5fbc0667b1d9fa2c diff --git a/qtxmlpatterns b/qtxmlpatterns index 5ca30406..9010c97b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5ca3040606c9dce1a410f1da059a501c03fc2cd9 +Subproject commit 9010c97bfb341166f963090935a0694a7ac5e929 -- cgit v1.2.3 From 9df51884939eb79301666547c2e0d24c744b5c5f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Feb 2019 15:46:34 +0100 Subject: 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 -- cgit v1.2.3 From 9b84c7135b9903d6f975ea082d7ae5958248a8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 16 Jan 2019 15:31:55 +0200 Subject: Build MIPS64 with b2qt toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This configuration verifies big endian builds Task-number: QTQAINFRA-2492 Reviewed-by: Qt CI Bot Reviewed-by: Samuli Piippo (cherry picked from commit 80339a10a4af1dbb282688fe03d4e52aac641c1d) Change-Id: I3111190b5c924eb73b037b94be1a0dc48bcc68c2 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 29 +++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index baf7fc9a..90095639 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,6 +22,7 @@ qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index fbe669d9..604ac551 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -40,7 +40,7 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -echo "Installing Yocto toolchain for 32-bit b2qt..." +echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." versionARM="2.3.4" package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" @@ -58,7 +58,7 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" rm -rf "$yoctoInstaller" -echo "Installing Yocto toolchain for 64-bit b2qt..." +echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." versionARM64="2.3.4" package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" @@ -76,11 +76,33 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..." + +versionMIPS64="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="dd03b496707ca8888b339a667e021722a8c2fdb4" +yoctoInstaller="/tmp/yocto-toolchain-mips64.sh" +yoctoLocationMIPS64="/opt/yocto-mips64" +sysrootMIPS64="sysroots/mips64-poky-linux" +crosscompileMIPS64="sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationMIPS64" +rm -rf "$yoctoInstaller" + + + +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" -a -e "$yoctoLocationMIPS64/$sysrootMIPS64" -a -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_SYSROOT" "$yoctoLocationMIPS64/$sysrootMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationMIPS64/$crosscompileMIPS64" else echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 exit 1 @@ -88,3 +110,4 @@ fi echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt +echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt -- cgit v1.2.3 From 26ff9bdc3d397650fe2a6d98d4dac37e498987ce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Feb 2019 09:37:16 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I3fe91983a4719ccd77146ed63165a7939358c3c0 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index ae44da62..5c98d15a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ae44da62ef30503a5380e5d1ee8b0cadd5960994 +Subproject commit 5c98d15a45da1d63614b2e7181536e12d2bcb02d diff --git a/qtcharts b/qtcharts index 1347a8ea..c01b60a4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1347a8ea80373ba3f5859ad2381c514526d3faa4 +Subproject commit c01b60a4882f256eea58ffc87d3aac9ce146f98d diff --git a/qtdeclarative b/qtdeclarative index 6a7c8749..e04e5db1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6a7c8749712c33e27cdbc93efdf54eddf8e7631f +Subproject commit e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab diff --git a/qtlocation b/qtlocation index 7a65e5f2..ad7bcebc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7a65e5f2b9d5ecda418e76f98acd90506025186a +Subproject commit ad7bcebc575922fc7c5654c118794e5758d347d2 diff --git a/qtquickcontrols b/qtquickcontrols index 352aeb96..ee36ee7f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 352aeb96a52590aff91e3f6a1e03c65418d596d3 +Subproject commit ee36ee7f7352b08da15d4e4875e93256e4cdc245 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/qtscript b/qtscript index e0c1663b..da2f08af 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit e0c1663b87126f58613c846b56dc1e69e4e06404 +Subproject commit da2f08af67916ce09daf6dea185a118e0f8bcd6b diff --git a/qttools b/qttools index b3c9f6cb..bf8ee4c9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b3c9f6cb9eb104bf4fe86b377aee7875473f97b4 +Subproject commit bf8ee4c99d56c2bf770343b7db07f68a2c6a7617 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d54d3f3b..017b7dff 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d54d3f3bd2e7dfd803ce8d97672934820edb0641 +Subproject commit 017b7dff8b3e8ebfcd399409b3706afc170124f3 diff --git a/qtwayland b/qtwayland index 401bdeca..60d6d83e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 401bdecabb950001ae3294e864ed397d1b76b3f4 +Subproject commit 60d6d83ea0c43462d5f8e17aaa654ab6f625dd6e diff --git a/qtwebengine b/qtwebengine index 5e92adf5..f4ca67aa 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 +Subproject commit f4ca67aa7f70f58d39ef8689ddd5910e215ed6cd -- cgit v1.2.3 From ef7908d90cd4acfd3dc9ddeb5dca4e9d53dde9d8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Feb 2019 20:49:49 +0100 Subject: 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 -- cgit v1.2.3 From 7bd38a4997943887c5ba680af27d11f250e23664 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Feb 2019 20:41:54 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I1653a60f6c0b5dab394b364814bcabf566090498 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 5c98d15a..c1f4286a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c98d15a45da1d63614b2e7181536e12d2bcb02d +Subproject commit c1f4286a5cbc1794fe7be5bdbbd6a0bf29ef84d4 -- cgit v1.2.3 From 2471d6dab8a0d0624431312480a457ae47547aa4 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Sat, 9 Feb 2019 18:55:26 +0200 Subject: Update qtwebengine Change-Id: I4f70e86ee6f22dd4e14780b606294ca26d0e4007 Reviewed-by: Allan Sandfeld Jensen --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index f4ca67aa..60f16cae 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f4ca67aa7f70f58d39ef8689ddd5910e215ed6cd +Subproject commit 60f16cae918adc96e5b01e8599b14a34b97902ef -- cgit v1.2.3 From f64ba39ce54a3d4a63d527ccb922ec59457cfb52 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Feb 2019 18:14:50 +0100 Subject: 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 -- cgit v1.2.3 From 2dff8afa987117b703bc0f9423f7227c0853e22e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 Feb 2019 23:08:07 +0100 Subject: 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 -- cgit v1.2.3 From 80deae9b74d1cfc0717767c882f654be8ae67b05 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 22 Jan 2019 11:54:55 +0200 Subject: 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 -- cgit v1.2.3 From 6967ec6b7333c56fbd9fb4387fe8edc7d1e05d7a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Feb 2019 19:05:59 +0100 Subject: 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 -- cgit v1.2.3 From d5d380f452aafd1590dff1d3bc99347bb16bd6e4 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 13 Feb 2019 09:25:22 +0200 Subject: Adjust submodule branches Change-Id: I309db20815d3b383155e6549b649607e956b8d89 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..8b797957 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.2 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.2 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.2 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.2 status = addon -- cgit v1.2.3 From 391ba3a9ca2c75c0229789c8f4f5e838da53b21f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Feb 2019 21:36:10 +0100 Subject: 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 -- cgit v1.2.3 From b0afdd4bc78907211187343fc05644da77a22b59 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 12 Feb 2019 10:30:32 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: Ie526118f93295f56e0c2bf951c6fe8ab2b427eea Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwinextras | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index bf40a6cb..306bc79e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bf40a6cbf6b0045c157431f2717697c37bd20697 +Subproject commit 306bc79ec33eb9130049cd124673a1e90a8232e6 diff --git a/qtandroidextras b/qtandroidextras index babd689a..9aad22ed 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit babd689a4a564e1d2b5cdfff67c0bdf7f48ede90 +Subproject commit 9aad22ed24537613e15f7aad760346e324a46690 diff --git a/qtbase b/qtbase index c1f4286a..7472415f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c1f4286a5cbc1794fe7be5bdbbd6a0bf29ef84d4 +Subproject commit 7472415f3f331ccd415cc644cc210d2457ef690c diff --git a/qtconnectivity b/qtconnectivity index 005cef90..8231e50c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 005cef90c6e06ef419dcec8f4619402677470301 +Subproject commit 8231e50c82c1cc2834c13263408fd4e38440c772 diff --git a/qtdeclarative b/qtdeclarative index e04e5db1..896d49a4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab +Subproject commit 896d49a4e1113e3eb4832b83920b0dfd76987259 diff --git a/qtdoc b/qtdoc index 414918dd..02705cfc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 414918dd0c5b7c4334bcb51c8a9d2fdc9be61c8a +Subproject commit 02705cfc21a3cb1f54feba3c4c251604f75f74ba diff --git a/qtimageformats b/qtimageformats index 5904479f..2decf5c6 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5904479f50ccafc9556475b4e039d707eadc58b7 +Subproject commit 2decf5c6dd3df823b385dce62b067fb5b13d399d diff --git a/qtmultimedia b/qtmultimedia index 26830d43..7dc84686 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 26830d435d942ce580dfe17209563c47eb3da722 +Subproject commit 7dc8468682e88dd218a6a7c424d666c3c834227c diff --git a/qtpurchasing b/qtpurchasing index 4c45534f..1052c8fd 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4c45534f40d963142ee4ac957679776b72c098b0 +Subproject commit 1052c8fd5506685096e313713841d7b89f3d2d05 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/qtquickcontrols2 b/qtquickcontrols2 index 3afec43b..7b48bda1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3afec43b69991753416380d88e22b5382b8b0832 +Subproject commit 7b48bda18f836671cda6d47d6570fc522a4361ec diff --git a/qtremoteobjects b/qtremoteobjects index 2a14e88f..bebfdc2b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2a14e88f548fbc20537ed9a2736c2e058a1d59af +Subproject commit bebfdc2b1ab467f0acf0f7d9c7b507431b3eba8d diff --git a/qtscxml b/qtscxml index 2d83e09f..6a631522 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2d83e09f9d6ca4d604571d7989a359381e6c93ff +Subproject commit 6a631522c7366f30d2d0a8645399a760a1663321 diff --git a/qtsvg b/qtsvg index fbad8e77..0c023ada 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit fbad8e7701708c07bfbae73e6c3158fd9e560ee7 +Subproject commit 0c023adada49bab1098e7df274ad7889828ef439 diff --git a/qttools b/qttools index bf8ee4c9..91be55e4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bf8ee4c99d56c2bf770343b7db07f68a2c6a7617 +Subproject commit 91be55e4fcf26be3f39a34b8659c1035d72c9c62 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 017b7dff..45506f4f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 017b7dff8b3e8ebfcd399409b3706afc170124f3 +Subproject commit 45506f4fcbc945ccc7bbb34d95776875ea0f97c1 diff --git a/qtwayland b/qtwayland index 60d6d83e..79d66c6e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 60d6d83ea0c43462d5f8e17aaa654ab6f625dd6e +Subproject commit 79d66c6ead287da8d5436d1b3513b8524eb2b197 diff --git a/qtwinextras b/qtwinextras index 4b745cf6..7c8f340c 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 4b745cf6111e2b164cd85d8aa30bef8ee7339f9a +Subproject commit 7c8f340c1d59975cc48f70e1a2b4ddb445f2e97d -- cgit v1.2.3 From 1c6f272dd0a0a43af85428efbe6d640a7a9803f6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Feb 2019 19:26:49 +0100 Subject: 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 -- cgit v1.2.3 From b3b6b100e64e0f47df141b086b3cfdf550296d51 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Feb 2019 19:31:04 +0100 Subject: Update submodules on '5.12.2' in qt5 Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index c4e9eabc..a5cded84 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c4e9eabc309a275efc222f4127f31ba4677259b7 +Subproject commit a5cded843f495b4276a8289b1324778d97bed5ba diff --git a/qtqa b/qtqa index 0797a581..50586f55 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0797a58105d77a9c4fbb1212eb376ca487d80f81 +Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 diff --git a/qttools b/qttools index b7decf54..6c8d8363 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b7decf54170ce71811bcbc13526e31914b0498e9 +Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 diff --git a/qtwebengine b/qtwebengine index 89ebafdb..3e88b4d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 89ebafdb6c41229f007d423aa785dea6ace07271 +Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e -- cgit v1.2.3 From abbd43c9430f3b7a28be791eb4e49840cb82dca0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 21 Jan 2019 08:42:50 +0200 Subject: Provisioning: update ARMv7 and ARM64 toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update toolchains to Yocto Sumo release with GCC 7.3.0 Task-number: QTQAINFRA-2630 Change-Id: I078cfebde1df039a3783f76c37f914f0dda0483f Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index 604ac551..e5514332 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." -versionARM="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56" +versionARM="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="a03b4eb492b16c6e60cf83c0718c27e9cfa6d522" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" @@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." -versionARM64="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d" +versionARM64="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="3dadf1135d00f7cb5586b605b1f7344ae828c9cd" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" -- cgit v1.2.3 From da2bd45ba6655a10ea6f932a769c97ae6769ead5 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 13 Feb 2019 13:14:36 +0200 Subject: Provisioning: Update mysql to Windows Currently this is the last version that support x86 for at least Windows. Task-number: QTQAINFRA-1996 Change-Id: Idd55694837afad2188697b4d5cc009a127ddb760 Reviewed-by: Andy Shaw --- coin/provisioning/common/windows/mysql.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 index 29ce0ab4..8ed91402 100644 --- a/coin/provisioning/common/windows/mysql.ps1 +++ b/coin/provisioning/common/windows/mysql.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,7 +36,7 @@ # This script installs MySQL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "5.6.11" +$version = "5.7.25" $baseNameX64 = "mysql-$version-winx64" $packagex64 = "C:\Windows\temp\$baseNameX64.zip" $baseNameX86 = "mysql-$version-win32" -- cgit v1.2.3 From 9c60d8b19081e57c51d5dd4942cac6c38ace3442 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 14 Feb 2019 11:40:45 +0200 Subject: Fix: Set correct path to environmental variable Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen --- coin/provisioning/common/unix/install-breakpad.sh | 2 +- coin/provisioning/common/windows/install-breakpad.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh index 669469be..b05b3510 100755 --- a/coin/provisioning/common/unix/install-breakpad.sh +++ b/coin/provisioning/common/unix/install-breakpad.sh @@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad" ) -SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src" +SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome" echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 index 4a9544cc..7db6d8ac 100644 --- a/coin/provisioning/common/windows/install-breakpad.ps1 +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -87,7 +87,7 @@ catch { git checkout $linux_syscall_support_commit_sha1 } -Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad" # Write HEAD commit sha to versions txt, so build can be repeated at later date Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt -- cgit v1.2.3 From 83d5226604365756adae991c4787edaf6d6b5c6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Feb 2019 12:43:28 +0000 Subject: Update submodules on '5.12.2' in qt5 Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index efa4665b..b237f38e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit efa4665b316dbd5361b0936a1135f45c141f14aa +Subproject commit b237f38e89016b40861de1e0675dc2ba5b3f361a diff --git a/qtactiveqt b/qtactiveqt index 4766c93e..b918e20d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4766c93e4df91ee3ecf510b5f011799e29f6093e +Subproject commit b918e20d4c9572bfc4148aba94ac53cf811b8cce diff --git a/qtbase b/qtbase index a5cded84..0f163887 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a5cded843f495b4276a8289b1324778d97bed5ba +Subproject commit 0f163887b526d00ccdcead907dde042aa370fc16 diff --git a/qtcanvas3d b/qtcanvas3d index 18e0ed4f..f9b7e894 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 18e0ed4fecb9642464c989a6c716a2b5cf400108 +Subproject commit f9b7e894b3d91bf760d71d7d784e2d162da0569e diff --git a/qtcharts b/qtcharts index 9da68921..694cf2bb 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9da68921e4bfb9c362600832b23128d488dc7aff +Subproject commit 694cf2bb87352f99e56aa687e13fdc7eeea40720 diff --git a/qtconnectivity b/qtconnectivity index 1606ccb7..1b19d798 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1606ccb76ba72990df652fbd7f01d709ae20b63c +Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b diff --git a/qtdatavis3d b/qtdatavis3d index 54adef94..428195cb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 +Subproject commit 428195cb2b1dc0c48eb348abb856cdaabf79dc0d diff --git a/qtdeclarative b/qtdeclarative index 91a71bce..dca09f09 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 91a71bce9c633934540e9f06fb081e3b89259ff3 +Subproject commit dca09f09734fff19a3a5ad930662e0e9abd3cb1b diff --git a/qtdoc b/qtdoc index 81200196..a38799f6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81200196ada801601c6c973643d2962be5a88ba7 +Subproject commit a38799f6e165e224750494bf515c78db4c4217db diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 56a4a58c..41ab3587 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 56a4a58c999e03385bad6ab052f87ffe2c63500f +Subproject commit 41ab3587cf0847e3442da6d14253e4bec4e87837 diff --git a/qtlocation b/qtlocation index 633b0f40..6c1c24e8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 +Subproject commit 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 diff --git a/qtmultimedia b/qtmultimedia index a7f01cea..4e47d0a7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a7f01cea43a16a9b2b06ab3a8ff3b62b8edce5cd +Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe diff --git a/qtnetworkauth b/qtnetworkauth index 83633211..bd9c083b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8363321174f64a1497952d2d7fec895a2a7e18f3 +Subproject commit bd9c083ba099a46d101ca64369f46ba7fba2a943 diff --git a/qtqa b/qtqa index 50586f55..e657206a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 +Subproject commit e657206a766f0cc48fe93f79bae01739387e2291 diff --git a/qtquickcontrols b/qtquickcontrols index 65d61277..b7f5cb18 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 65d61277be164a0781f9b57873afc000f36073fa +Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 579422fa..0dfc617e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 579422faaad76b12341a725320da65fcabb3cf7b +Subproject commit 0dfc617e4d089f7513573673d12f9678a88d3081 diff --git a/qtscxml b/qtscxml index 01399f96..dca1cd7c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01399f9600174a0c77ffc57d32c07ce0698952e1 +Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 diff --git a/qtsensors b/qtsensors index 7792137f..73d5160a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7792137f3fcd400f3933e8f7f328b35aa0586f81 +Subproject commit 73d5160ab8219015a25e59c62669b2926156b807 diff --git a/qtserialport b/qtserialport index b43e8fa2..624f1754 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 +Subproject commit 624f175492660301af5eb321d2b8d6af7aa7fbc3 diff --git a/qtspeech b/qtspeech index 0711336d..f899a4c2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0711336d26804898393a99640e1442df7fd3828c +Subproject commit f899a4c2051ca4256faba2d268ca032dd129f200 diff --git a/qtsvg b/qtsvg index a91a6563..2430c9ed 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a91a65632c4d830070e1ca9bbda7e355f1459414 +Subproject commit 2430c9ed20f3f10da7bc3e7fdb5328d8501f5776 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c099fef8..277aad92 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c099fef8041f6cfd56e789b86c70a802c894da34 +Subproject commit 277aad92fb5d5612c2b952f05063518d877a5138 diff --git a/qtwebengine b/qtwebengine index 3e88b4d3..8fefc0d9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3e88b4d35441301e44981874c06c16e3c6351b6e +Subproject commit 8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632 diff --git a/qtwebsockets b/qtwebsockets index 9a0a655b..b4bac09b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9a0a655b51086045ce86c9d001d34738d84d27ff +Subproject commit b4bac09b3b2f0c3072d797b22c44e20b661c4723 diff --git a/qtx11extras b/qtx11extras index 16528689..3bfaa268 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 165286899e3426730e5dfcd155f92b571c978416 +Subproject commit 3bfaa26890990d140caba4b9a1050906c2ee546c diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e2450f4..e8026ec6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e2450f4559f03a480e37318084bab99fdc128fc +Subproject commit e8026ec6a30c5124c2e3162d9a17e9ae11fa4475 -- cgit v1.2.3 From becac559b713dfadd27198d683fde70551a543c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Feb 2019 20:33:50 +0100 Subject: Update submodules on '5.12.2' in qt5 Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtcharts | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index b237f38e..3de900a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b237f38e89016b40861de1e0675dc2ba5b3f361a +Subproject commit 3de900a10c6fd051ba54727be2fd1fe47ed10481 diff --git a/qtandroidextras b/qtandroidextras index 1c7de170..860fd4b9 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1c7de1701f1f75c2ce6cfff1baa6ab49ee669073 +Subproject commit 860fd4b991a9f94f07aaf45cee36bab661f3dd28 diff --git a/qtcharts b/qtcharts index 694cf2bb..c9bc2672 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 694cf2bb87352f99e56aa687e13fdc7eeea40720 +Subproject commit c9bc2672b513a414708026f4271d247feaa26471 diff --git a/qtmultimedia b/qtmultimedia index 4e47d0a7..9caf4812 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe +Subproject commit 9caf4812e073829fc961eb466f1325106f041841 diff --git a/qtpurchasing b/qtpurchasing index dff997ec..2234141c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 +Subproject commit 2234141c0ec838dd537bec909c87e8a184125f68 diff --git a/qtqa b/qtqa index e657206a..507202b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e657206a766f0cc48fe93f79bae01739387e2291 +Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af diff --git a/qtremoteobjects b/qtremoteobjects index 5f941451..1c19349a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5f94145128035bce167ca23780296564aa5f25d1 +Subproject commit 1c19349a28a75eec386b84af142fc571e492a3c3 diff --git a/qtscxml b/qtscxml index dca1cd7c..4bb7aa3f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 +Subproject commit 4bb7aa3f3002b9ba85494e5cf4808f68e0edc502 diff --git a/qtserialbus b/qtserialbus index 670f912f..745120dd 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 670f912fbc08002ac063504755fc7705931e0d6e +Subproject commit 745120ddca5fa67f1a87741e0a5c016acbd53deb diff --git a/qttools b/qttools index 6c8d8363..b0147a5d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 +Subproject commit b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8 diff --git a/qtwayland b/qtwayland index 4b58ff21..0d717b0c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4b58ff21f4a3c629867064289b6c778bbb57f95a +Subproject commit 0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb diff --git a/qtwebview b/qtwebview index 17334eb5..0aa43dc5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17334eb56b42114927169ee8eec6512754674fb2 +Subproject commit 0aa43dc555e0a820bf13a6b12671ee6a79161155 diff --git a/qtwinextras b/qtwinextras index f2dc1d1a..23dd4484 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 +Subproject commit 23dd4484915e3de89a093f8525afed1c5b8294eb -- cgit v1.2.3 From 06fb909429041b5e169e81bfc5c930fea7adf8fd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Sat, 23 Feb 2019 08:20:08 +0200 Subject: Provisioning: Change installation order for dotnet-framework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows updates can't be disabled before dotnet-framework is enabled Task-number: QTQAINFRA-2824 Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc Reviewed-by: Tony Sarajärvi --- .../01-disable-windows-updates.ps1 | 1 - .../01-enable-dotnet-framework.ps1 | 22 ++++++++++++++++++++++ .../02-disable-windows-updates.ps1 | 1 + .../02-enable-dotnet-framework.ps1 | 22 ---------------------- 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 new file mode 100644 index 00000000..e7f4c248 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 @@ -0,0 +1,22 @@ +# The DirectX SDK installer requires .Net framework 3.5 which isn't installed +# by default + +$netFeature = "NetFx3" +try { + $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State + if ($netFeatureState -eq "Enabled") { + Write-Host ".Net Framework is already installed" + exit 0 + } +} catch { + Write-Host "Could not find .Net Framework Windows feature." + exit 1 +} + +Write-Host "Installing .Net Framework client" +try { + Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart +} catch { + Write-Host "Could not install .Net framework" + exit 1 +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 new file mode 100644 index 00000000..57428310 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 deleted file mode 100644 index e7f4c248..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# The DirectX SDK installer requires .Net framework 3.5 which isn't installed -# by default - -$netFeature = "NetFx3" -try { - $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State - if ($netFeatureState -eq "Enabled") { - Write-Host ".Net Framework is already installed" - exit 0 - } -} catch { - Write-Host "Could not find .Net Framework Windows feature." - exit 1 -} - -Write-Host "Installing .Net Framework client" -try { - Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart -} catch { - Write-Host "Could not install .Net framework" - exit 1 -} -- cgit v1.2.3 From d5c96aad5a9171d41ae195362187148084bc7f27 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 20 Feb 2019 15:48:42 +0200 Subject: Provisioning: Remove docker from macOS provisioning When docker provisioning starting test-server in virtual box whole virtual machine will reboot. Let's remove docker until it's more stable or we know how to fix it. Task-number: QTQAINFRA-2801 Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e (cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a) Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/macos/docker.sh | 63 ------------------- .../provisioning/common/macos/docker_testserver.sh | 71 ---------------------- .../qtci-macos-10.12-x86_64/80-docker.sh | 4 -- .../qtci-macos-10.13-x86_64/80-docker.sh | 4 -- 4 files changed, 142 deletions(-) delete mode 100755 coin/provisioning/common/macos/docker.sh delete mode 100755 coin/provisioning/common/macos/docker_testserver.sh delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh delete mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh diff --git a/coin/provisioning/common/macos/docker.sh b/coin/provisioning/common/macos/docker.sh deleted file mode 100755 index 899bfee6..00000000 --- a/coin/provisioning/common/macos/docker.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/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 - -# Download and install the Docker Toolbox for macOS (Docker Compose and Docker Machine). -url="https://download.docker.com/mac/stable/DockerToolbox.pkg" -target_file="DockerToolbox.pkg" - -if [ -x "$(command -v sha1sum)" ] -then - # This part shall be used in CI environment only. The DownloadURL script needs sha1sum - # which is not included in the default macOS system. In addition, the cached pkg can't - # be downloaded out of the Qt internal network. - case ${BASH_SOURCE[0]} in - */macos/*) UNIX_PATH="${BASH_SOURCE[0]%/macos/*}/unix" ;; - */*) UNIX_PATH="${BASH_SOURCE[0]%/*}/../unix" ;; - *) UNIX_PATH="../unix" ;; - esac - - source "$UNIX_PATH/DownloadURL.sh" - url_cached="http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.pkg" - sha1="7196d2d30648d486978d29adb5837ff7876517c1" - DownloadURL $url_cached $url $sha1 $target_file -else - curl $url -o $target_file -fi -sudo installer -pkg $target_file -target / - -# Start testserver provisioning -source "${BASH_SOURCE%/*}/docker_testserver.sh" diff --git a/coin/provisioning/common/macos/docker_testserver.sh b/coin/provisioning/common/macos/docker_testserver.sh deleted file mode 100755 index 051386ea..00000000 --- a/coin/provisioning/common/macos/docker_testserver.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/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 - -case ${BASH_SOURCE[0]} in - */macos/*) SERVER_PATH="${BASH_SOURCE[0]%/macos/*}/shared/testserver" ;; - */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;; - *) SERVER_PATH="../shared/testserver" ;; -esac - -# testserver shared scripts -source "$SERVER_PATH/testserver_util.sh" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -cpu_features=$(sysctl -a | grep machdep.cpu.features) -case $cpu_features in - *VMX*) ;; - *) echo "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." >&2; exit 1 ;; -esac - -# Create docker virtual machine (Boot2docker) -source "$SERVER_PATH/docker_machine.sh" - -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. - -source "$SERVER_PATH/settings.sh" - -for server in $testserver -do - context="$SERVER_PATH/$server" - docker build -t qt-test-server-$server:$(sha1tree $context) $context -done - -docker images diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh b/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh deleted file mode 100755 index a5d362cb..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/docker.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh b/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh deleted file mode 100755 index a5d362cb..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/docker.sh -- cgit v1.2.3 From 4e99a6976cae711cb4d456d137088b2acb99f96f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Feb 2019 15:02:29 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I7bf5a68c37be83ba2ad4e67ba24bcae7243297a0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qt3d b/qt3d index 306bc79e..e8f551be 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 306bc79ec33eb9130049cd124673a1e90a8232e6 +Subproject commit e8f551be32913f5a9f9e9ce011b172a4a2a366b0 diff --git a/qtbase b/qtbase index 7472415f..8c10255e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7472415f3f331ccd415cc644cc210d2457ef690c +Subproject commit 8c10255e377c38a8655c733dc527674b1f5cb3da diff --git a/qtcharts b/qtcharts index c01b60a4..dd07bf6a 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c01b60a4882f256eea58ffc87d3aac9ce146f98d +Subproject commit dd07bf6a9aadf1db040df12fb8796782fe6b46f6 diff --git a/qtconnectivity b/qtconnectivity index 8231e50c..cc615e02 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8231e50c82c1cc2834c13263408fd4e38440c772 +Subproject commit cc615e02420769e61993e6183897087992a47d6c diff --git a/qtdatavis3d b/qtdatavis3d index 7d7038d4..d0ece82c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7d7038d47a72cd203785080e997458f0d44f5e15 +Subproject commit d0ece82c68825a25a55ecaa148bd36f161e351e1 diff --git a/qtdeclarative b/qtdeclarative index 896d49a4..3baa2d55 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 896d49a4e1113e3eb4832b83920b0dfd76987259 +Subproject commit 3baa2d550512702dfc227aef0af3542ab189824f diff --git a/qtdoc b/qtdoc index 02705cfc..1357695e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 02705cfc21a3cb1f54feba3c4c251604f75f74ba +Subproject commit 1357695e1becd90f3d8a9162af9196be1f53d398 diff --git a/qtlocation b/qtlocation index ad7bcebc..e80ba97c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ad7bcebc575922fc7c5654c118794e5758d347d2 +Subproject commit e80ba97cd95f0b01ef79b9f99c9ab499aac4249f diff --git a/qtlottie b/qtlottie index a53d7c01..11194e8c 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a53d7c014d68988a94e0be3219736a5dc266e1fb +Subproject commit 11194e8c38f5a8eef11f9d9e9b72508d8923722d diff --git a/qtmultimedia b/qtmultimedia index 7dc84686..14b0f477 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7dc8468682e88dd218a6a7c424d666c3c834227c +Subproject commit 14b0f477159b5d0d28b38a67c6f329042ad322fa diff --git a/qtnetworkauth b/qtnetworkauth index a0d04006..77f55b1d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a0d040060f6ff1a4db87498afdcf85ce46de0d81 +Subproject commit 77f55b1db58bb9941791a70185e88829cca9db6d diff --git a/qtpurchasing b/qtpurchasing index 1052c8fd..4c873e79 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 1052c8fd5506685096e313713841d7b89f3d2d05 +Subproject commit 4c873e79bd9d02b707392aacf3699fdca3c990ec diff --git a/qtqa b/qtqa index 0797a581..507202b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0797a58105d77a9c4fbb1212eb376ca487d80f81 +Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7b48bda1..3096fc2b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7b48bda18f836671cda6d47d6570fc522a4361ec +Subproject commit 3096fc2b49d299056554ec5fbf9fd12874282919 diff --git a/qtremoteobjects b/qtremoteobjects index bebfdc2b..9387eae3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit bebfdc2b1ab467f0acf0f7d9c7b507431b3eba8d +Subproject commit 9387eae35fe82b441c6349a866929e855363db45 diff --git a/qtscript b/qtscript index da2f08af..313e6548 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit da2f08af67916ce09daf6dea185a118e0f8bcd6b +Subproject commit 313e6548b0393af9069b043f65ea6e6c0a546487 diff --git a/qtscxml b/qtscxml index 6a631522..60796708 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6a631522c7366f30d2d0a8645399a760a1663321 +Subproject commit 60796708aad85281a519a85cdebcfab50914370f diff --git a/qttools b/qttools index 91be55e4..54df8b58 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 91be55e4fcf26be3f39a34b8659c1035d72c9c62 +Subproject commit 54df8b58fd1285ee94e5f3c7e7d354f5df15d2e8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 45506f4f..8a4042a5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 45506f4fcbc945ccc7bbb34d95776875ea0f97c1 +Subproject commit 8a4042a51f0b3047b8e423c439d797ce06a74160 diff --git a/qtwayland b/qtwayland index 79d66c6e..81e154e2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 79d66c6ead287da8d5436d1b3513b8524eb2b197 +Subproject commit 81e154e264274907e329bfb1d54d20e0db0bbfd2 diff --git a/qtwebengine b/qtwebengine index 60f16cae..678cb710 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 60f16cae918adc96e5b01e8599b14a34b97902ef +Subproject commit 678cb710bb07188454b19a70b5e5595b8ea41c2a diff --git a/qtwebglplugin b/qtwebglplugin index d5ed6b5c..31f06ca3 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d5ed6b5cfd8b8af6c9396a1234df1633aa22dbd8 +Subproject commit 31f06ca32ebd87c5b1bad6882e2d0b4689c7e85a -- cgit v1.2.3 From 099b7ffe4c386b8997ce2f8014f7f8442a9190a1 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 18 Feb 2019 09:38:02 +0200 Subject: Provisioning: Update emsdk version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-73867 Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545 Reviewed-by: Morten Johan Sørvig --- coin/provisioning/common/linux/emsdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..284eb19d 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.16" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d" +sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" -- cgit v1.2.3 From e9d5fdaa205055cfd4ef684d39e777d3414dbd59 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Feb 2019 12:46:44 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I33af247c322de51b34dc65381be9e4e03261842d Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index 8c10255e..bc107d81 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8c10255e377c38a8655c733dc527674b1f5cb3da +Subproject commit bc107d81004a5f3929f30088f4a58a221bea5c3b diff --git a/qtcharts b/qtcharts index dd07bf6a..c071170b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit dd07bf6a9aadf1db040df12fb8796782fe6b46f6 +Subproject commit c071170b1dd51f6f682a8b1aeea158d33b84df3b diff --git a/qtdeclarative b/qtdeclarative index 3baa2d55..1415d0f7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3baa2d550512702dfc227aef0af3542ab189824f +Subproject commit 1415d0f7168661fd91be1171a0bf6584a751f277 diff --git a/qtdoc b/qtdoc index 1357695e..6c3104b7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1357695e1becd90f3d8a9162af9196be1f53d398 +Subproject commit 6c3104b7445a8993fa902bcdeff5a05faf05ea1e diff --git a/qtmultimedia b/qtmultimedia index 14b0f477..d247abab 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 14b0f477159b5d0d28b38a67c6f329042ad322fa +Subproject commit d247ababe8f248dcfac4da63970e6bc2192bc0e4 diff --git a/qtpurchasing b/qtpurchasing index 4c873e79..f4cbadce 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4c873e79bd9d02b707392aacf3699fdca3c990ec +Subproject commit f4cbadce04bc07aa30017cdbef701f2b92fa1500 diff --git a/qttools b/qttools index 54df8b58..bfb970a5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 54df8b58fd1285ee94e5f3c7e7d354f5df15d2e8 +Subproject commit bfb970a5ae603f42b73870eb88fe486cf5315a46 diff --git a/qttranslations b/qttranslations index f9b9f475..95d09971 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f9b9f4753ca8cd4ef978e61db6125b9fba668c0e +Subproject commit 95d09971c36ed6920475b1eb10834de35859e4a0 diff --git a/qtwayland b/qtwayland index 81e154e2..2f0e6d77 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 81e154e264274907e329bfb1d54d20e0db0bbfd2 +Subproject commit 2f0e6d773647d2112fcf34ab0d9d724f8278477c diff --git a/qtwebchannel b/qtwebchannel index 7fa4cf25..3809bdf1 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7fa4cf258af693f0fe61e5006ad83a91c63a45df +Subproject commit 3809bdf15524e65397447eb7ba62a289c5ef58d4 diff --git a/qtwebengine b/qtwebengine index 678cb710..6546a8e1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 678cb710bb07188454b19a70b5e5595b8ea41c2a +Subproject commit 6546a8e122d8fe7725701d76285eb6156eebf8e4 diff --git a/qtwebview b/qtwebview index b9864e03..c40add66 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b9864e03bec6753b0407e8ba784b15bb4394362c +Subproject commit c40add66f77afe18fe952013fd9503ab4c568efc diff --git a/qtwinextras b/qtwinextras index 7c8f340c..5c136f42 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7c8f340c1d59975cc48f70e1a2b4ddb445f2e97d +Subproject commit 5c136f42ea48357d0b2370f8c0b731f656ceca22 -- cgit v1.2.3 From ffe8fd770183b2abc293dc356f3ac82c56143bab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Feb 2019 10:51:03 +0100 Subject: Update submodules on '5.12.2' in qt5 Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index dca09f09..00f283cf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dca09f09734fff19a3a5ad930662e0e9abd3cb1b +Subproject commit 00f283cf54068ec55ead07df44c424c629894749 diff --git a/qtquickcontrols b/qtquickcontrols index b7f5cb18..d641c584 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e +Subproject commit d641c584b1ed5cfae860dc0e9b08526ae6eb2c93 diff --git a/qtwebengine b/qtwebengine index 8fefc0d9..b47b28d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632 +Subproject commit b47b28d3cfb8b249cce343031507864de99117a7 -- cgit v1.2.3 From 091820f6a12f3d1932adf974406b1b62a13662ef Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 19 Feb 2019 08:48:58 +0200 Subject: Remove qt3d-runtime.txt symbolic link from platform configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) mode change 120000 => 100644 coin/platform_configs/qt3d-runtime.txt diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 120000 index 9b3b4cd8..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1 +0,0 @@ -qt5.txt \ No newline at end of file diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 100644 index 00000000..3de18a74 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1,22 @@ +Template Target OS Target arch Compiler Target Compiler Features +--------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 3a1e557e5493272783d73030ac3b33cf500d459e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Feb 2019 12:45:32 +0000 Subject: Update submodules on '5.12.2' in qt5 Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtwebchannel | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 0f163887..e8d3306c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0f163887b526d00ccdcead907dde042aa370fc16 +Subproject commit e8d3306c8f86bf21648693521d8be91bb8f1335e diff --git a/qtconnectivity b/qtconnectivity index 1b19d798..eec8fed7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b +Subproject commit eec8fed760a572eb9187f79b43d87986f2b4f404 diff --git a/qtdeclarative b/qtdeclarative index 00f283cf..cd7ce85f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00f283cf54068ec55ead07df44c424c629894749 +Subproject commit cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f diff --git a/qtdoc b/qtdoc index a38799f6..ecc569fb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a38799f6e165e224750494bf515c78db4c4217db +Subproject commit ecc569fbcd1dc41cc08796a42752ff394826771b diff --git a/qtgamepad b/qtgamepad index 8dd9ee5e..744e13b3 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39 +Subproject commit 744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b diff --git a/qtimageformats b/qtimageformats index 0e8422be..1b8478f8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0e8422bedc8c84ff7c08c6b3163329e82c2007dd +Subproject commit 1b8478f86f15dc1dd125a2a0d8331bc3600a79c1 diff --git a/qtlocation b/qtlocation index 6c1c24e8..a00c5e40 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6c1c24e8e47895e7ce045d9650e2b161c7c014f9 +Subproject commit a00c5e40a2df03713d29da83a5692f2d7c15326d diff --git a/qtmacextras b/qtmacextras index 18594a39..4509e67e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 18594a3928dbc82597cf6d9fb90ca07d2a67bcb1 +Subproject commit 4509e67e2206f9077645d5946faf7dc2f1132156 diff --git a/qtquickcontrols b/qtquickcontrols index d641c584..c231395e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d641c584b1ed5cfae860dc0e9b08526ae6eb2c93 +Subproject commit c231395eec3494619f4977b4c5cd845b9d7341ae diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0dfc617e..ca799283 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0dfc617e4d089f7513573673d12f9678a88d3081 +Subproject commit ca799283a2266b023923286b4928fdf6e7211569 diff --git a/qtscript b/qtscript index 5a9de40f..6c0edaf3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5a9de40f48f5854b6ff20329ced0f0509b81b48a +Subproject commit 6c0edaf30c5bdfc2739ca646da73dcb697ab1361 diff --git a/qtwebchannel b/qtwebchannel index d14c6aa5..45da510a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 +Subproject commit 45da510a0a87593a2ae6f98e41bb01b9d39ace58 -- cgit v1.2.3 From 4df2866684116491c35c57d11e1fb692bc00aa0f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 1 Mar 2019 10:07:25 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I20eba8a90e0683263245a01eac5a553c78961050 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 7f9fdca7..22c66fa9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7f9fdca73a17060b9d69db00b5d480690dcae935 +Subproject commit 22c66fa9f7a460f077fede22f285c84276ce3883 diff --git a/qtbase b/qtbase index 501cca2c..a2b31cd5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 501cca2c4b0851cea7133ba56c3a05d71c25ce6d +Subproject commit a2b31cd5db6410144a613142a7b60f0cd2ba2b1d diff --git a/qtcharts b/qtcharts index 9da68921..de84efac 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9da68921e4bfb9c362600832b23128d488dc7aff +Subproject commit de84efac79724970bcdeac7fcdfe72a5fa846761 diff --git a/qtconnectivity b/qtconnectivity index 1606ccb7..1b19d798 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1606ccb76ba72990df652fbd7f01d709ae20b63c +Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b diff --git a/qtdatavis3d b/qtdatavis3d index 54adef94..e91e0d04 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 +Subproject commit e91e0d04e214a372bf0c26b6f2edda1d7c47c552 diff --git a/qtdeclarative b/qtdeclarative index d96a700c..e622e069 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d96a700cc3611480ff76023287cb06f455a37b02 +Subproject commit e622e069c9b0928e09a8b6fef15168407a4d995a diff --git a/qtdoc b/qtdoc index a38799f6..323572c5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a38799f6e165e224750494bf515c78db4c4217db +Subproject commit 323572c586c06b20a8ddccaed0add6deb9283903 diff --git a/qtlocation b/qtlocation index 633b0f40..628cf98e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 +Subproject commit 628cf98e820f552f228d6f71c770c293fce83a79 diff --git a/qtmultimedia b/qtmultimedia index 4e47d0a7..fea4d302 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe +Subproject commit fea4d302cddbb91e23864a4dbd786d53b72f67ea diff --git a/qtqa b/qtqa index 50586f55..507202b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 +Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af diff --git a/qtquickcontrols b/qtquickcontrols index 65d61277..b7f5cb18 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 65d61277be164a0781f9b57873afc000f36073fa +Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0614d792..9fdbdea1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0614d792967b7721c692cb273bb5428544fa3680 +Subproject commit 9fdbdea176007ed7b470e317e9002aa77ddd4ead diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c099fef8..81204883 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c099fef8041f6cfd56e789b86c70a802c894da34 +Subproject commit 81204883f671951371a8582008e1357634e7ff0f diff --git a/qtwayland b/qtwayland index 4b58ff21..7206b4e8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4b58ff21f4a3c629867064289b6c778bbb57f95a +Subproject commit 7206b4e8b6e10f5623b19ca132f538066c96aab5 diff --git a/qtwebengine b/qtwebengine index 74d2d301..598bfc65 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 74d2d301b11f2edfde69f0515e2fd74882ab6dab +Subproject commit 598bfc652edffb047948e01c3c76eb9e0cb7db4e -- cgit v1.2.3 From abfc2cd5719707b242db71da4192598900f094dd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 18 Feb 2019 10:19:07 +0200 Subject: Provisioning: Update emsdk version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-73867 Change-Id: I4caab8d434787bf4323e1ea3232bf4bf23c1ec8d Reviewed-by: Juha Karjalainen Reviewed-by: Morten Johan Sørvig --- coin/provisioning/common/linux/emsdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..3515b870 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.27" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" -- cgit v1.2.3 From b74bc40b4145340473f0b7a25c045597397bdbab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 Mar 2019 10:24:25 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index a2b31cd5..a74b2b5f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a2b31cd5db6410144a613142a7b60f0cd2ba2b1d +Subproject commit a74b2b5f152ae81da6c0906afc63b8647c3a048a diff --git a/qtdeclarative b/qtdeclarative index e622e069..7df099a6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e622e069c9b0928e09a8b6fef15168407a4d995a +Subproject commit 7df099a644339a487a5ad681d61efb1c7ecd81f6 diff --git a/qtmultimedia b/qtmultimedia index fea4d302..09490d1a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fea4d302cddbb91e23864a4dbd786d53b72f67ea +Subproject commit 09490d1ac6294173004f8f5b948dea9a1e412d3d diff --git a/qtpurchasing b/qtpurchasing index dff997ec..098dd780 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 +Subproject commit 098dd780b7e773f3e945c6e1b4b7fef51fb0a446 diff --git a/qtquickcontrols b/qtquickcontrols index b7f5cb18..46425199 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e +Subproject commit 46425199ebcdd4cb9facb471f67e17a941ca103f diff --git a/qtscript b/qtscript index 5a9de40f..4749a3ec 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5a9de40f48f5854b6ff20329ced0f0509b81b48a +Subproject commit 4749a3ec61859e324f14add3008c41f92e6c2793 diff --git a/qtsvg b/qtsvg index a91a6563..f354d4be 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a91a65632c4d830070e1ca9bbda7e355f1459414 +Subproject commit f354d4be9a7a436fb16bd9764a261c930101850c diff --git a/qttools b/qttools index 6c8d8363..b4597180 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 +Subproject commit b4597180191734ca128772d2b8547c6e6c08efa2 diff --git a/qttranslations b/qttranslations index c8a0da51..46220125 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c8a0da51adcc015447fc26e5a2b3d1de12479f75 +Subproject commit 4622012565e28bffec22daff5fa81addece703e3 diff --git a/qtwebengine b/qtwebengine index 598bfc65..56fadb57 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 598bfc652edffb047948e01c3c76eb9e0cb7db4e +Subproject commit 56fadb571f32b721d8b99554e6e38692009ec37f diff --git a/qtwebview b/qtwebview index 17334eb5..fc039435 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17334eb56b42114927169ee8eec6512754674fb2 +Subproject commit fc039435b57bb5860ee3c59542d29b106071ffb5 -- cgit v1.2.3 From bec94435f8b8e8a7e0e1226c774ba3dcabf76b41 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 Mar 2019 10:25:44 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I798c8bc1278a02cdf9043ed50eade5ff66b6502d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index e8f551be..698bd5f2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e8f551be32913f5a9f9e9ce011b172a4a2a366b0 +Subproject commit 698bd5f22c79ecf777a0abe57a36676dc49fa8f3 diff --git a/qtbase b/qtbase index bc107d81..607338f9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc107d81004a5f3929f30088f4a58a221bea5c3b +Subproject commit 607338f98feaa2561340c7ff4249d470b36d0503 diff --git a/qtdeclarative b/qtdeclarative index 1415d0f7..af055ca5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1415d0f7168661fd91be1171a0bf6584a751f277 +Subproject commit af055ca5793a4a3a3e306e8bc605665e6ae24bfd diff --git a/qtdoc b/qtdoc index 6c3104b7..22e2694d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6c3104b7445a8993fa902bcdeff5a05faf05ea1e +Subproject commit 22e2694da6d960e674d3931ca3b6d9ed2c1e48e1 diff --git a/qtlocation b/qtlocation index e80ba97c..6ab05afc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e80ba97cd95f0b01ef79b9f99c9ab499aac4249f +Subproject commit 6ab05afcfca6df2c96ef2d69149332f24eebb9e6 diff --git a/qtmultimedia b/qtmultimedia index d247abab..f1c5e109 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d247ababe8f248dcfac4da63970e6bc2192bc0e4 +Subproject commit f1c5e109a48b6fdef641528985e249c10c1ae1a2 diff --git a/qtpurchasing b/qtpurchasing index f4cbadce..9363738e 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f4cbadce04bc07aa30017cdbef701f2b92fa1500 +Subproject commit 9363738ed780d32b40f2428ca5dfa1c919db424e diff --git a/qtquickcontrols b/qtquickcontrols index ee36ee7f..d8e0a208 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ee36ee7f7352b08da15d4e4875e93256e4cdc245 +Subproject commit d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3096fc2b..6f5bc03e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3096fc2b49d299056554ec5fbf9fd12874282919 +Subproject commit 6f5bc03ecbf0e8233ae638a54457557c6c32cba2 diff --git a/qtremoteobjects b/qtremoteobjects index 9387eae3..a5583f4f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9387eae35fe82b441c6349a866929e855363db45 +Subproject commit a5583f4fefadef7c66c3b9dd0d01cbedce79b740 diff --git a/qtscript b/qtscript index 313e6548..1959699e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 313e6548b0393af9069b043f65ea6e6c0a546487 +Subproject commit 1959699e48ce0e4379b42132dc9803da309e8c18 diff --git a/qtsvg b/qtsvg index 0c023ada..65011e9f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0c023adada49bab1098e7df274ad7889828ef439 +Subproject commit 65011e9f1b23ab62fff8d9327eeafedd29c91332 diff --git a/qttools b/qttools index bfb970a5..6f6a4a57 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bfb970a5ae603f42b73870eb88fe486cf5315a46 +Subproject commit 6f6a4a574ebc61f8e341e681e63b5a2f66156ce2 diff --git a/qttranslations b/qttranslations index 95d09971..971d5da4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 95d09971c36ed6920475b1eb10834de35859e4a0 +Subproject commit 971d5da415b900c34d6d563b39f415174e5d24f5 diff --git a/qtwayland b/qtwayland index 2f0e6d77..9b05557a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2f0e6d773647d2112fcf34ab0d9d724f8278477c +Subproject commit 9b05557a6325497485b582c3891367aa7dfee245 diff --git a/qtwebengine b/qtwebengine index 6546a8e1..4dc31201 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6546a8e122d8fe7725701d76285eb6156eebf8e4 +Subproject commit 4dc312011bcaa2ee2cf812b5b84dc9238130e608 diff --git a/qtwebview b/qtwebview index c40add66..cd0cb72a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c40add66f77afe18fe952013fd9503ab4c568efc +Subproject commit cd0cb72a2cd219af5faade928c06b61df715b14b diff --git a/qtxmlpatterns b/qtxmlpatterns index 9010c97b..9c1abb9c 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9010c97bfb341166f963090935a0694a7ac5e929 +Subproject commit 9c1abb9c6666b66fcef4ca963ba4f290695ffc90 -- cgit v1.2.3 From cfea5af0edd05107e4d9b242c02a60765e10a07d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Mar 2019 22:26:37 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtscript | 2 +- qtsvg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index a74b2b5f..ef5aefb0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a74b2b5f152ae81da6c0906afc63b8647c3a048a +Subproject commit ef5aefb062bf8cbfb764f2deba731d3d64069099 diff --git a/qtdeclarative b/qtdeclarative index 7df099a6..783ec607 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7df099a644339a487a5ad681d61efb1c7ecd81f6 +Subproject commit 783ec60774a565f3a16c25af076b720de0e6acbd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 56a4a58c..23a9a049 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 56a4a58c999e03385bad6ab052f87ffe2c63500f +Subproject commit 23a9a04935c28110c2cff0d71873573d8f8f51c3 diff --git a/qtscript b/qtscript index 4749a3ec..a122caec 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 4749a3ec61859e324f14add3008c41f92e6c2793 +Subproject commit a122caecff790a82f707894fa9db72afe91fcb7e diff --git a/qtsvg b/qtsvg index f354d4be..6f152f87 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f354d4be9a7a436fb16bd9764a261c930101850c +Subproject commit 6f152f87dbbd47acc58458d636ce5d1cc181b8fd -- cgit v1.2.3 From a99977cf788bbced96f502df1a7134f4b2b1f1e2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Mar 2019 22:31:42 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I20b6331abe3a914c5cf2503be61c34e2efe60016 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 607338f9..1270aeb0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 607338f98feaa2561340c7ff4249d470b36d0503 +Subproject commit 1270aeb0f96547ad32512c92ee2e69adb1f27011 diff --git a/qtdeclarative b/qtdeclarative index af055ca5..0d25cd5d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit af055ca5793a4a3a3e306e8bc605665e6ae24bfd +Subproject commit 0d25cd5d9763e65dea6239ec7280da16d772c794 diff --git a/qtgamepad b/qtgamepad index 419bc7bc..8991d01d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 419bc7bc6e469ac88522ee9dabcf36ac1c66280c +Subproject commit 8991d01d2acd440dffbf01645aa04291e05e27f3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6f5bc03e..18da9482 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6f5bc03ecbf0e8233ae638a54457557c6c32cba2 +Subproject commit 18da9482bb52d7a59bc7ffac719bc03e2e164417 diff --git a/qtscript b/qtscript index 1959699e..2a106f26 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 1959699e48ce0e4379b42132dc9803da309e8c18 +Subproject commit 2a106f26d6030063be5d25726d0f4b5e6a1d50b3 diff --git a/qttools b/qttools index 6f6a4a57..be0ac28a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6f6a4a574ebc61f8e341e681e63b5a2f66156ce2 +Subproject commit be0ac28aa54db547d60b6ebd27cbb4941808eced diff --git a/qtwebengine b/qtwebengine index 4dc31201..cad0edfc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4dc312011bcaa2ee2cf812b5b84dc9238130e608 +Subproject commit cad0edfcfefba67e9f4dbb2fd44368dc036eef33 -- cgit v1.2.3 From 88b35a49212e4151b955a7604e20f67be0b62c9c Mon Sep 17 00:00:00 2001 From: Johanna Aijala Date: Wed, 28 Nov 2018 15:33:40 +0200 Subject: Update Squish to 6.4.3 Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- coin/provisioning/common/windows/squishInstall.ps1 | 28 ++++++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 4a7a6837..b40c1922 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,9 +38,9 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.3.2" +version="6.4.3" # Branch version without dot -qtBranch="510x" +qtBranch="512x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" squishFile="squish-$version-qt$qtBranch-linux64.run" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 5fb032f5..21dfea39 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,18 +38,18 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.2" +$version = "6.4.3" # Qt branch without dot (*.*) -$qtBranch = "510x" -# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point +$qtBranch = "512x" +# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. $targetDir = "C:\Utils\squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" $testSuite = "suite_test_squish" -$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z" +$testSuiteUrl = "$squishUrl\$testSuite.7z" # Squish license $licensePackage = ".squish-3-license" @@ -62,7 +62,10 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - + # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 + if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { + $qtBranch = "511x" + } $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" @@ -125,25 +128,24 @@ DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 msvc14 + DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3 From 7100c54887416c99d9f4f08b81e61f1bd03fda3c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 17:45:51 +0000 Subject: Update submodules on '5.12.2' in qt5 Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e8d3306c..856fb1ab 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e8d3306c8f86bf21648693521d8be91bb8f1335e +Subproject commit 856fb1ab44722f5165fb6b5dec0bd748006acd10 diff --git a/qtwebengine b/qtwebengine index b47b28d3..92b078a5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b47b28d3cfb8b249cce343031507864de99117a7 +Subproject commit 92b078a534390dba64a0dcebcffdab4ce24581b6 -- cgit v1.2.3 From ec772e3e4a9fcf36fa1bb06c89fadc0fc32c338b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 21:21:56 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 22c66fa9..4af8fcdc 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 22c66fa9f7a460f077fede22f285c84276ce3883 +Subproject commit 4af8fcdc05d0198a569e7c39fa934614bbe31803 diff --git a/qtbase b/qtbase index ef5aefb0..e431a3ac 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ef5aefb062bf8cbfb764f2deba731d3d64069099 +Subproject commit e431a3ac027915dbfc0588f42f3b56e07639811e diff --git a/qtcharts b/qtcharts index de84efac..203508d4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit de84efac79724970bcdeac7fcdfe72a5fa846761 +Subproject commit 203508d4aff39cfb7d8a7f3192884a190f203020 diff --git a/qtconnectivity b/qtconnectivity index 1b19d798..3f9ba9c0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b +Subproject commit 3f9ba9c07322d90f8f918d9e144e84d422e4cfbd diff --git a/qtdeclarative b/qtdeclarative index 783ec607..c911349b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 783ec60774a565f3a16c25af076b720de0e6acbd +Subproject commit c911349b8bdcc7f798091eb6acd20395883b2000 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9fdbdea1..73914e00 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9fdbdea176007ed7b470e317e9002aa77ddd4ead +Subproject commit 73914e00dba2fe259108197d01b6744ce16b63d8 diff --git a/qtremoteobjects b/qtremoteobjects index 5f941451..7dd6dda4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5f94145128035bce167ca23780296564aa5f25d1 +Subproject commit 7dd6dda47a1eec17a7193455df1087c361d975b5 diff --git a/qttranslations b/qttranslations index 46220125..85e12b88 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4622012565e28bffec22daff5fa81addece703e3 +Subproject commit 85e12b885e93a9f086b6a29f3cfb4a9a632013f4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 81204883..eea791e1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 81204883f671951371a8582008e1357634e7ff0f +Subproject commit eea791e14a4e2c94ba3ac292292b76b05d56385c diff --git a/qtwebengine b/qtwebengine index 56fadb57..2bf39d83 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56fadb571f32b721d8b99554e6e38692009ec37f +Subproject commit 2bf39d83a532a7fa69adc99caafaa523276b03c5 -- cgit v1.2.3 From 9a5d221afc9458a424596657098c8610c9672690 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 21:24:49 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I85f2cd016dc8c3e98e39ebee057d1d6bfc71d19b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 698bd5f2..fa63d206 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 698bd5f22c79ecf777a0abe57a36676dc49fa8f3 +Subproject commit fa63d206ced9a6253cd81acf4c82fa49d85c3352 diff --git a/qtbase b/qtbase index 1270aeb0..859f837d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1270aeb0f96547ad32512c92ee2e69adb1f27011 +Subproject commit 859f837d46a2e7f00a2f43d654a01c5de1b61b1f diff --git a/qtcharts b/qtcharts index c071170b..b0650184 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c071170b1dd51f6f682a8b1aeea158d33b84df3b +Subproject commit b06501840033f8aa001aa13fa9abcaef921604f5 diff --git a/qtdeclarative b/qtdeclarative index 0d25cd5d..014e7a91 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0d25cd5d9763e65dea6239ec7280da16d772c794 +Subproject commit 014e7a91f20eb01bac3ec99cea5c76053ae4b59e diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 0fc226b3..6ffa20bc 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 0fc226b32789adee140951c63739da65a081d211 +Subproject commit 6ffa20bc5fb4ee1c556ab09a15e6e2be3b011fb9 diff --git a/qtlocation b/qtlocation index 6ab05afc..b1f6028c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6ab05afcfca6df2c96ef2d69149332f24eebb9e6 +Subproject commit b1f6028c2aba51b898ce380f7b584ae603a06382 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 18da9482..1693a19f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 18da9482bb52d7a59bc7ffac719bc03e2e164417 +Subproject commit 1693a19fd557c857ef4f43ab303ea1056790481e diff --git a/qttools b/qttools index be0ac28a..e32eec12 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit be0ac28aa54db547d60b6ebd27cbb4941808eced +Subproject commit e32eec121c0131aa0ece1ece67a0740baebc41dc diff --git a/qttranslations b/qttranslations index 971d5da4..f74de77d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 971d5da415b900c34d6d563b39f415174e5d24f5 +Subproject commit f74de77d311235cebc1f0769e48aa22f420d52d4 diff --git a/qtwayland b/qtwayland index 9b05557a..91e6f98a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9b05557a6325497485b582c3891367aa7dfee245 +Subproject commit 91e6f98ab1ffd283fb786787ba0b61360fd471cc diff --git a/qtwebengine b/qtwebengine index cad0edfc..dc6c8d5c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cad0edfcfefba67e9f4dbb2fd44368dc036eef33 +Subproject commit dc6c8d5c9fe61ba58d065564f4d6dc0571475004 -- cgit v1.2.3 From e403403b39113b625d67473691949df85d506bda Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 8 Mar 2019 14:04:31 +0100 Subject: Update clang-format config Set column width to 100 as described in the official Qt coding style (https://wiki.qt.io/Qt_Coding_Style). Also, break constructor initializers before the colon and after the commas. Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c Reviewed-by: Frederik Gladhorn --- _clang-format | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_clang-format b/_clang-format index ee000a1e..4cdda2fb 100644 --- a/_clang-format +++ b/_clang-format @@ -15,7 +15,7 @@ Standard: Cpp11 # Leave the line breaks up to the user. # Note that this may be changed at some point in the future. -ColumnLimit: 0 +ColumnLimit: 100 # How much weight do extra characters after the line length limit have. # PenaltyExcessCharacter: 4 @@ -77,4 +77,5 @@ SortIncludes: false # macros for which the opening brace stays attached. ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] - +# Break constructor initializers before the colon and after the commas. +BreakConstructorInitializers: BeforeColon -- cgit v1.2.3 From afa1b053fed7c1be94f4f639d608479e9e39974d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 Mar 2019 13:47:11 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c Reviewed-by: Liang Qi --- qtbase | 2 +- qtspeech | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e431a3ac..3702622d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e431a3ac027915dbfc0588f42f3b56e07639811e +Subproject commit 3702622dde060442534019bd99cbbf140391547b diff --git a/qtspeech b/qtspeech index 0711336d..ca42f92a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0711336d26804898393a99640e1442df7fd3828c +Subproject commit ca42f92ab22c26fbcd6b1408ef57ed5199313456 -- cgit v1.2.3 From 76c80866af78274eeb973ab38ad7b44f216b1a1e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Feb 2019 13:28:47 +0200 Subject: Provisioning: Help script for removing items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes items are locked (access denied) so we need to have function which waits and retry until removing is possible. Task-number: QTQAINFRA-2806 Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745 Reviewed-by: Tony Sarajärvi Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/windows/helpers.ps1 | 19 +++++++++++++++++++ coin/provisioning/common/windows/vc_redist.ps1 | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 76ad4867..f5318bcb 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -159,3 +159,22 @@ function IsProxyEnabled { function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } + +function Remove { + + Param ( + [string]$Path = $(BadParam("a path")) + ) + Write-Host "Removing $Path" + $i = 0 + While ( Test-Path($Path) ){ + Try{ + remove-item -Force -Recurse -Path $Path -ErrorAction Stop + }catch{ + $i +=1 + if ($i -eq 5) {exit 1} + Write-Verbose "$Path locked, trying again in 5" + Start-Sleep -seconds 5 + } + } +} diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index f68846f0..1cd81a37 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." Run-Executable $package "/q" -Write-Host "Remove $package..." -Remove-Item -Force -Path $package +Remove $package -- cgit v1.2.3 From fc1d5bbe4c8e4f0a217e5f006ecda11b4a07b921 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Mar 2019 19:44:28 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I696da0adc9f8f11c08765662016972d4c47a8a04 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 859f837d..fbc9fb23 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 859f837d46a2e7f00a2f43d654a01c5de1b61b1f +Subproject commit fbc9fb233dfb1959924632b428048d5f6a3401d9 diff --git a/qtconnectivity b/qtconnectivity index cc615e02..b6f4d00b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cc615e02420769e61993e6183897087992a47d6c +Subproject commit b6f4d00b1ed8942df0832bb179de2ea331fc6755 diff --git a/qtdeclarative b/qtdeclarative index 014e7a91..850aaa0f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 014e7a91f20eb01bac3ec99cea5c76053ae4b59e +Subproject commit 850aaa0fb43f64a2d9cf5160fd6c54dd552cd6a5 diff --git a/qtgamepad b/qtgamepad index 8991d01d..604611df 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8991d01d2acd440dffbf01645aa04291e05e27f3 +Subproject commit 604611dffd0a63558dc5a1bc40654ceb8448f19f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1693a19f..08ceb93c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1693a19fd557c857ef4f43ab303ea1056790481e +Subproject commit 08ceb93cf16dcdc771935ac66e6c4b5ce02ec36d diff --git a/qtremoteobjects b/qtremoteobjects index a5583f4f..f7921b5f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a5583f4fefadef7c66c3b9dd0d01cbedce79b740 +Subproject commit f7921b5f67cfe2e83d282f470128524f3fdee238 diff --git a/qtspeech b/qtspeech index 4a972ad8..f98930fc 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 4a972ad8027b2e4845a8a3ac3f119dc0f3b05407 +Subproject commit f98930fc465412d5921486ec0497bb5d5b74ae8b diff --git a/qtsvg b/qtsvg index 65011e9f..8ca3b325 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 65011e9f1b23ab62fff8d9327eeafedd29c91332 +Subproject commit 8ca3b32561b68bed3b5897e87aa912c93e9739c4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8a4042a5..4a2701a0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8a4042a51f0b3047b8e423c439d797ce06a74160 +Subproject commit 4a2701a05400f0621cef04980c419637ff6d1d00 -- cgit v1.2.3 From f9c5acb2ffb1e25ef4e63bac17cf268c422108a1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Mar 2019 19:42:22 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a Reviewed-by: Liang Qi --- qtbase | 2 +- qtgamepad | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 3702622d..912bcf0f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3702622dde060442534019bd99cbbf140391547b +Subproject commit 912bcf0f0df166705f9bfd0a74ab6afcf7b42f1b diff --git a/qtgamepad b/qtgamepad index 8dd9ee5e..45feea99 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39 +Subproject commit 45feea99efe1b28b71b649b26790616a20f20d14 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 73914e00..1ef176b5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 73914e00dba2fe259108197d01b6744ce16b63d8 +Subproject commit 1ef176b5da8ad8d4993fa9296e64e44ee8de6560 -- cgit v1.2.3 From cc1203311a530fc9e72d16b16f1c8649deb20a7d Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Sun, 10 Mar 2019 19:47:00 +0100 Subject: Update comment in clang-format file Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594 Reviewed-by: Andy Maloney Reviewed-by: Lars Knoll --- _clang-format | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_clang-format b/_clang-format index 4cdda2fb..c64ae331 100644 --- a/_clang-format +++ b/_clang-format @@ -13,7 +13,8 @@ BasedOnStyle: WebKit Standard: Cpp11 -# Leave the line breaks up to the user. +# Column width is limited to 100 in accordance with Qt Coding Style. +# https://wiki.qt.io/Qt_Coding_Style # Note that this may be changed at some point in the future. ColumnLimit: 100 # How much weight do extra characters after the line length limit have. -- cgit v1.2.3 From 4c46984c46545c4912f4ed2a1c6289328ec5c582 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Mar 2019 13:02:26 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d Reviewed-by: Liang Qi --- qtbase | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index fbc9fb23..a9cd8ce2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fbc9fb233dfb1959924632b428048d5f6a3401d9 +Subproject commit a9cd8ce2961190e51c59cdd34c26c5b6f4c70aa1 diff --git a/qtlocation b/qtlocation index b1f6028c..9f86b735 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b1f6028c2aba51b898ce380f7b584ae603a06382 +Subproject commit 9f86b7353f1cdb01fe98efa8130fb6ccb5b4337d diff --git a/qtmultimedia b/qtmultimedia index f1c5e109..9a5bae4e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f1c5e109a48b6fdef641528985e249c10c1ae1a2 +Subproject commit 9a5bae4ed9ca10fedf842b5c293d1c0ef918c8af diff --git a/qtqa b/qtqa index 507202b4..7253baaa 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af +Subproject commit 7253baaa602d557ba2853b6b22074a4aa1f4923a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 08ceb93c..e8b3db1b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 08ceb93cf16dcdc771935ac66e6c4b5ce02ec36d +Subproject commit e8b3db1bedf1c62f810d26d17ce91a687448bcc4 diff --git a/qttools b/qttools index e32eec12..177b92c4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e32eec121c0131aa0ece1ece67a0740baebc41dc +Subproject commit 177b92c4d499b6ffc5986d7c46c8c3c98d08f130 diff --git a/qtwayland b/qtwayland index 91e6f98a..eabdc86b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 91e6f98ab1ffd283fb786787ba0b61360fd471cc +Subproject commit eabdc86b3a8bc1c94c917166667c3aed57f049f8 diff --git a/qtwebsockets b/qtwebsockets index 3b925727..d14e55f6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3b925727801483809c963acb7df08dae0f3d0e8a +Subproject commit d14e55f660d0b5e36e7d83b830c6422328a485d8 -- cgit v1.2.3 From 05455843158054656296f89051f594a5a5bfdbc0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Mar 2019 21:29:26 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I8c823bab00e24f89a748986bf3eacf12d8de1d46 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlottie | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index fa63d206..6f7ac292 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fa63d206ced9a6253cd81acf4c82fa49d85c3352 +Subproject commit 6f7ac29268df048b5f23ad26c47efcbfdfdb3585 diff --git a/qtbase b/qtbase index a9cd8ce2..eb25acc0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a9cd8ce2961190e51c59cdd34c26c5b6f4c70aa1 +Subproject commit eb25acc05b177c49eb81b190a476854fbf3c6fb1 diff --git a/qtdeclarative b/qtdeclarative index 850aaa0f..2b36b81f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 850aaa0fb43f64a2d9cf5160fd6c54dd552cd6a5 +Subproject commit 2b36b81feb76df1a2757d66321fad2d474d7f2fe diff --git a/qtlottie b/qtlottie index 11194e8c..553ec1bc 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 11194e8c38f5a8eef11f9d9e9b72508d8923722d +Subproject commit 553ec1bc799f344a12e34c91720e13a469d85365 diff --git a/qtqa b/qtqa index 7253baaa..dc4cbd9f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7253baaa602d557ba2853b6b22074a4aa1f4923a +Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 diff --git a/qtquickcontrols b/qtquickcontrols index d8e0a208..972027ab 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2 +Subproject commit 972027abacfe3ff598db02913afdd54a72fc8633 diff --git a/qttools b/qttools index 177b92c4..369bbbfb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 177b92c4d499b6ffc5986d7c46c8c3c98d08f130 +Subproject commit 369bbbfb5aca70a7d1f8a32bd36a3d3c41721ffa -- cgit v1.2.3 From 675deb147463a9354aebd4a487783a41d578917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 8 Mar 2019 07:41:10 -0800 Subject: Add Squish for MSVC2017 x64 to Win10 x64 machines Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 21dfea39..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -129,6 +129,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" } else { DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" @@ -146,6 +147,8 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3 From deecc97dc248aaa2e5a51bcb00a351c2063b2420 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Mar 2019 12:12:49 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: Ibd880c74a5842a88d8ee0a8cb1eaf3487b4f7192 Reviewed-by: Liang Qi --- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdatavis3d b/qtdatavis3d index d0ece82c..5c2043f7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d0ece82c68825a25a55ecaa148bd36f161e351e1 +Subproject commit 5c2043f77c31bb02a5ce7c2e0fbb8d040f395d3c diff --git a/qtdeclarative b/qtdeclarative index 2b36b81f..f10ac43e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2b36b81feb76df1a2757d66321fad2d474d7f2fe +Subproject commit f10ac43ebb839b61315bd3b370b77683b625e4c4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4a2701a0..3323deeb 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4a2701a05400f0621cef04980c419637ff6d1d00 +Subproject commit 3323deeb9915fc51b6b1044798edc2160bf78087 -- cgit v1.2.3 From 48ab1d879bc5dc1f65ee6671e546f58ae1c67bee Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Fri, 22 Feb 2019 13:38:26 +0200 Subject: Fix provisioning disable defragmentation for windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If no scheduled task exist it would throw error causing provisioning to fail. Now catch when scheduling does not exist. Task-number: QTQAINFRA-2823 Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-defragment.ps1 | 42 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 index 876938f8..e76f0649 100644 --- a/coin/provisioning/common/windows/disable-defragment.ps1 +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,4 +31,42 @@ ## ############################################################################# -schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} -- cgit v1.2.3 From ca9f9b9cc452d5b307f295e3248e65ea1bc5d8c1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 10:12:44 +0100 Subject: Update submodules on 'dev' in qt5 Change-Id: I7484fcfc4915d0e22057b671bba6e63243452ceb Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qt3d b/qt3d index 299c0bc6..50c73e50 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 299c0bc6d2ea5817ba32b3724290c349789be11b +Subproject commit 50c73e50d3f285f169896e82ca362f7c94f00c81 diff --git a/qtactiveqt b/qtactiveqt index 3832b74a..d9a196a9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3832b74aca592f8edf4cc54867d0a56334e797e7 +Subproject commit d9a196a9a51d2a40ec7a64cacacab5608195be86 diff --git a/qtbase b/qtbase index 17512d49..b35eec36 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 17512d497d7eaf01aefe8140f5010818c0103a95 +Subproject commit b35eec360d4d88d094094fb54c101fad6cee5768 diff --git a/qtcharts b/qtcharts index 40149204..5ef80b87 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 40149204fe6df6c7bcee1d215b277d4553b385f4 +Subproject commit 5ef80b87d3961ca84859c2e95422820718d76f74 diff --git a/qtconnectivity b/qtconnectivity index b58c4709..ead0cf31 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b58c470962aa6831f53d088afd523c1b1530fbc8 +Subproject commit ead0cf31f9611b6ecefc0f9985cf07306c89e70a diff --git a/qtdeclarative b/qtdeclarative index 00bcc365..662c53dc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00bcc365403f253e0c6fd54b7b1715ba974679c5 +Subproject commit 662c53dc583188d0278c86f59ab6b80056dbd419 diff --git a/qtdoc b/qtdoc index c2eb165e..695b871c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c2eb165e4cad518fa3a0660588199144477fb30e +Subproject commit 695b871c06299fff96373f07d08a3074490d45fc diff --git a/qtgamepad b/qtgamepad index 2ff613b5..e09f04e8 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2ff613b5971d687d8d92e6baad3466ee2af5c434 +Subproject commit e09f04e8b2e0593efcd1bbbdeacadde58521d1fd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index dbddc986..5c8530c1 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit dbddc98658a8d1dc407ff0eb7d40558e99d831c7 +Subproject commit 5c8530c1fc4b9a6e52043353b97bfeba9900dc7a diff --git a/qtlocation b/qtlocation index c8771162..7e35bd3a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c8771162fca507caaf3c1881ac26e47593608b66 +Subproject commit 7e35bd3a31341b9593134808b08ee8dee6951c10 diff --git a/qtmultimedia b/qtmultimedia index bb1fde25..c5458cb2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bb1fde2553fa05de0603df96dcd9d60cecc8548d +Subproject commit c5458cb29a74ee8757746fc63c8e29b3accd4975 diff --git a/qtpurchasing b/qtpurchasing index 5b705a2b..768c533f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 5b705a2b6896f8b613ad1e3120696ec0f81885e4 +Subproject commit 768c533feb7116d906e1fbd2775cb59298e46931 diff --git a/qtqa b/qtqa index 507202b4..dc4cbd9f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af +Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 diff --git a/qtquickcontrols b/qtquickcontrols index f984a80d..490b0f38 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f984a80d055e4c9bbd2224d0db54f4233838591b +Subproject commit 490b0f38b64735230228b304f956a4c63c8a0895 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 247dad29..745ff8a9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 247dad297cb7f8d5af42434c67d24ffcc7bae017 +Subproject commit 745ff8a9186d40c5c53f8ffa0a26d2730e6c214d diff --git a/qtremoteobjects b/qtremoteobjects index d9b4c020..c1e92756 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d9b4c020eb158d7fceb439ff66f7ce5db5a9df5b +Subproject commit c1e92756b95f35dba09ddd48f2dfd645aea331d8 diff --git a/qtscript b/qtscript index 54176314..b494dc90 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 54176314d1c06ef387e797258cfc3993274665c9 +Subproject commit b494dc90e5fcc159d7ca85dc8a614039235651e8 diff --git a/qtspeech b/qtspeech index 0b7c9acb..2d642b77 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0b7c9acbafbfe32f6ccb254b7ec656fac6fb189b +Subproject commit 2d642b774665087ad9f0ee541368b3ba5564e74f diff --git a/qtsvg b/qtsvg index 43a0fc84..b46f7ace 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 43a0fc8412b9da42d81a508fc5265510f2dfd175 +Subproject commit b46f7ace38c6fbb50e7689842a5c38a59279824f diff --git a/qttools b/qttools index 7e355162..62e4e202 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7e355162ca7566df29045d4fa25fed74c97f3bae +Subproject commit 62e4e2021bc1e68ae9bd2e9b49556282cfe816b9 diff --git a/qtwayland b/qtwayland index c9970025..a1e6810e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c9970025bc912c6d3b2fe6183762c6f254e84aef +Subproject commit a1e6810e6914b4b43d9f7f1ee195e75b8d4426ab diff --git a/qtwebengine b/qtwebengine index bbd11d8d..efb0cbc6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bbd11d8da5c52c5c76a6657d884d2e648e410108 +Subproject commit efb0cbc61b64800b175d7b45ee4febe1462c26c1 diff --git a/qtwebsockets b/qtwebsockets index d1a9b0db..1668c311 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d1a9b0db6b1f7fd048c6388e96b08799a7bf62ca +Subproject commit 1668c31166f83189c30aaeb8aed07e014259e963 diff --git a/qtwebview b/qtwebview index f8c19094..8837eaa8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f8c190945d7b3679db5a322de8e49acc88748c7d +Subproject commit 8837eaa817274cd0c896237ea37d5ac3095359c1 diff --git a/qtwinextras b/qtwinextras index c496ca49..a0892744 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit c496ca49dc0a01edcb0576818dab705ff5e02fec +Subproject commit a0892744250fb0352a710ffd15a0024165b01e08 -- cgit v1.2.3 From 3d087c5a6a815041e0e8dec206f2b0b3e51f1a03 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 15 Feb 2019 12:19:28 +0100 Subject: Split docker provisioning files Split the creation of the test images and the creation of the docker environment. This way, one can easily recreate the test images, without requiring to re-provision everything. Change-Id: I35bbe8d8bf497f16d9be92cbaa2d9001f8eee247 Reviewed-by: Maurice Kalinowski Reviewed-by: Ryan Chu --- .../common/shared/testserver/docker_images.sh | 68 ++++++++++++++++++++++ .../common/shared/testserver/docker_testserver.sh | 27 +-------- 2 files changed, 70 insertions(+), 25 deletions(-) create mode 100755 coin/provisioning/common/shared/testserver/docker_images.sh diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh new file mode 100755 index 00000000..e98183d8 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/docker_images.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + +[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]} +case $FILE in + */*) SERVER_PATH="${FILE%/*}" ;; + *) SERVER_PATH="." ;; +esac + +# Sort files by their SHA-1, and then return the accumulated result +sha1tree () { + # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. + [ -x "$(command -v sha1sum)" ] || SHASUM=shasum + + find "$@" -type f -print0 | \ + xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ + sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 +} + +# Using SHA-1 of each server context as the tag of docker images. A tag labels a +# specific image version. It is used by docker compose file (docker-compose.yml) +# to launch the corresponding docker containers. If one of the server contexts +# (./apache2, ./danted, ...) gets changes, all the related compose files in +# qtbase should be updated as well. + +source "$SERVER_PATH/settings.sh" + +for server in $testserver +do + context="$SERVER_PATH/$server" + docker build -t qt-test-server-$server:$(sha1tree $context) $context +done + +docker images diff --git a/coin/provisioning/common/shared/testserver/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh index 83baa488..3a7c87e8 100755 --- a/coin/provisioning/common/shared/testserver/docker_testserver.sh +++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh @@ -53,28 +53,5 @@ esac # Display system-wide information of docker-engine docker info -# Sort files by their SHA-1, and then return the accumulated result -sha1tree () { - # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. - [ -x "$(command -v sha1sum)" ] || SHASUM=shasum - - find "$@" -type f -print0 | \ - xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ - sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 -} - -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. - -source "$SERVER_PATH/settings.sh" - -for server in $testserver -do - context="$SERVER_PATH/$server" - docker build -t qt-test-server-$server:$(sha1tree $context) $context -done - -docker images +# Create images +$SERVER_PATH/docker_images.sh -- cgit v1.2.3 From 0660a25cca3c922346653e1bc486a0c8aa59f5aa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Feb 2019 14:00:21 +0200 Subject: Provisioning: Make gnuwin32 available for windows machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen Reviewed-by: Tony Sarajärvi --- .../common/windows/install-gnuwin32.ps1 | 46 ++++++++++++++++++++++ .../qtci-windows-10-x86/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-10-x86_64/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-7-x86/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-7-x86_64/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-8.1-x86/36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + 7 files changed, 58 insertions(+) create mode 100644 coin/provisioning/common/windows/install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 new file mode 100644 index 00000000..99862b3c --- /dev/null +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################ +. "$PSScriptRoot\helpers.ps1" + +# This script will install gnuwin32 + +$prog = "gnuwin32" +$zipPackage = "$prog.zip" +$temp = "$env:tmp" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage" +$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage" +Download $externalUrl $internalUrl "$temp\$zipPackage" +Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" +Extract-7Zip "$temp\$zipPackage" C:\Utils + +Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + -- cgit v1.2.3 From 7158816eedebd865bb3d840827852345729e73ff Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 17 Mar 2019 11:25:05 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I9b5cfc02f045711d84084dd52e3add7baa3a0722 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index df68df84..822050ca 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit df68df8489d393a5800a0a183b6151ec0342662e +Subproject commit 822050cadf4f67f72e3b0ef108b547e8a85d6028 diff --git a/qtandroidextras b/qtandroidextras index 9aad22ed..15b2059e 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9aad22ed24537613e15f7aad760346e324a46690 +Subproject commit 15b2059e73df2f103c7206dd8d8a14a1fa3ca7b6 diff --git a/qtbase b/qtbase index eb25acc0..4554fa7b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eb25acc05b177c49eb81b190a476854fbf3c6fb1 +Subproject commit 4554fa7b191566df0a6c07e686c642c78eb88095 diff --git a/qtcharts b/qtcharts index b0650184..6a4c59bd 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b06501840033f8aa001aa13fa9abcaef921604f5 +Subproject commit 6a4c59bd9b583ffe83d131b5e5647f49672deab3 diff --git a/qtconnectivity b/qtconnectivity index b6f4d00b..bb80398c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b6f4d00b1ed8942df0832bb179de2ea331fc6755 +Subproject commit bb80398caacdae6e319cb17d4953e3800ff277f2 diff --git a/qtdatavis3d b/qtdatavis3d index 5c2043f7..4d88f5b7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 5c2043f77c31bb02a5ce7c2e0fbb8d040f395d3c +Subproject commit 4d88f5b7dacfd1f8c9f60aacd0f75b027fffbc51 diff --git a/qtdeclarative b/qtdeclarative index f10ac43e..dc3e3090 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f10ac43ebb839b61315bd3b370b77683b625e4c4 +Subproject commit dc3e3090d21339d78abc706369117b3396c843af diff --git a/qtdoc b/qtdoc index 22e2694d..14ea2e1a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 22e2694da6d960e674d3931ca3b6d9ed2c1e48e1 +Subproject commit 14ea2e1a53b92c50566a48e7eece1198fd518c63 diff --git a/qtgamepad b/qtgamepad index 604611df..e36343e5 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 604611dffd0a63558dc5a1bc40654ceb8448f19f +Subproject commit e36343e5b175bc44fc9dc3289533416b47c207e7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 6ffa20bc..44c54c6b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 6ffa20bc5fb4ee1c556ab09a15e6e2be3b011fb9 +Subproject commit 44c54c6b106c65ff21d636ce74c40fe5e602361b diff --git a/qtimageformats b/qtimageformats index 2decf5c6..45e7c2b0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2decf5c6dd3df823b385dce62b067fb5b13d399d +Subproject commit 45e7c2b0b2221d1659b480d31d4f596d5ac3f444 diff --git a/qtmacextras b/qtmacextras index 57c10f82..8eb192fe 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 57c10f82725d3468fc0027b694601300a7c169bb +Subproject commit 8eb192fe9ed2583e21450a1e567b3d461398d322 diff --git a/qtmultimedia b/qtmultimedia index 9a5bae4e..95b7fc49 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9a5bae4ed9ca10fedf842b5c293d1c0ef918c8af +Subproject commit 95b7fc4950c1f0d895896cf3086c69126d45e061 diff --git a/qtnetworkauth b/qtnetworkauth index 77f55b1d..e3a77155 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 77f55b1db58bb9941791a70185e88829cca9db6d +Subproject commit e3a77155253d40133476212713094c3bc897a938 diff --git a/qtpurchasing b/qtpurchasing index 9363738e..3402a9fd 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9363738ed780d32b40f2428ca5dfa1c919db424e +Subproject commit 3402a9fd2a98b2fa1c067b6560cb0adef507f796 diff --git a/qtquickcontrols b/qtquickcontrols index 972027ab..35e83521 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 972027abacfe3ff598db02913afdd54a72fc8633 +Subproject commit 35e83521b6a4c9efd50d498b23892b81ebbf20e7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e8b3db1b..4a434b19 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e8b3db1bedf1c62f810d26d17ce91a687448bcc4 +Subproject commit 4a434b19c347a6014f42cbcf0f1493d689e579fc diff --git a/qtrepotools b/qtrepotools index f9c6da38..a29ca613 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 +Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 diff --git a/qtscript b/qtscript index 2a106f26..32845dc7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 2a106f26d6030063be5d25726d0f4b5e6a1d50b3 +Subproject commit 32845dc708f21cd814e4a091504b2cb016de86e0 diff --git a/qtscxml b/qtscxml index 60796708..133fe954 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 60796708aad85281a519a85cdebcfab50914370f +Subproject commit 133fe95450beaba4be3db584752d80adc37d5fff diff --git a/qtsensors b/qtsensors index 1579f198..3f28dbc2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1579f19830443484c4c51d6924a5b141b4e816e4 +Subproject commit 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e diff --git a/qtserialbus b/qtserialbus index 81a50f7c..c8c0d240 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 81a50f7c45cdaa88668a953d40f67d6809b2b16a +Subproject commit c8c0d240081b1f68fad0603c5658f9314acabe2e diff --git a/qtserialport b/qtserialport index dc70c4c6..a301e0ec 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dc70c4c650b9a0ece63bb8334d1b4e7d7b09818e +Subproject commit a301e0ec1af0d888c032978fa8bcb155560ddb43 diff --git a/qtspeech b/qtspeech index f98930fc..44c23c8c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f98930fc465412d5921486ec0497bb5d5b74ae8b +Subproject commit 44c23c8c1a3a78da27e33dd6a48dc57f9876ed37 diff --git a/qtsvg b/qtsvg index 8ca3b325..82578970 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8ca3b32561b68bed3b5897e87aa912c93e9739c4 +Subproject commit 82578970d435e17738612c7bd6c1f4a9f58468cc diff --git a/qttools b/qttools index 369bbbfb..46ddc942 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 369bbbfb5aca70a7d1f8a32bd36a3d3c41721ffa +Subproject commit 46ddc9424ddd64316234194c31ac4ffad6cbab07 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3323deeb..51f7bb2d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3323deeb9915fc51b6b1044798edc2160bf78087 +Subproject commit 51f7bb2dab3737670da4fb7bc94d5b437a07fc27 diff --git a/qtwayland b/qtwayland index eabdc86b..26fccd2e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eabdc86b3a8bc1c94c917166667c3aed57f049f8 +Subproject commit 26fccd2e63ae82d1883077dfb14b7720b3c93ef1 diff --git a/qtwebengine b/qtwebengine index dc6c8d5c..31fe2e8c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dc6c8d5c9fe61ba58d065564f4d6dc0571475004 +Subproject commit 31fe2e8c1eda4a805882df79bb8cb33f06f1c799 diff --git a/qtwebsockets b/qtwebsockets index d14e55f6..da87e40e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d14e55f660d0b5e36e7d83b830c6422328a485d8 +Subproject commit da87e40ed671757bbdcd83d45018467918fd94e7 diff --git a/qtwinextras b/qtwinextras index 5c136f42..fe4c2bf0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5c136f42ea48357d0b2370f8c0b731f656ceca22 +Subproject commit fe4c2bf06610da5bb27e63dcd784e11724b06773 diff --git a/qtx11extras b/qtx11extras index e0b62282..986ea0aa 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit e0b62282231888028c520efc5fbc0667b1d9fa2c +Subproject commit 986ea0aa5ffe4d50623fedc7ab3e482aec99687a diff --git a/qtxmlpatterns b/qtxmlpatterns index 9c1abb9c..0a8a27a0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9c1abb9c6666b66fcef4ca963ba4f290695ffc90 +Subproject commit 0a8a27a0f1543423ea236a2e5ee5d851337e2481 -- cgit v1.2.3 From 5df387f9248bd1a1d3e0681c073a80de097f1341 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 17 Mar 2019 11:23:09 +0100 Subject: Update submodules on 'dev' in qt5 Change-Id: Id296241c270ea33450e57ef07b382930711daa89 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index b35eec36..11b9c813 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b35eec360d4d88d094094fb54c101fad6cee5768 +Subproject commit 11b9c813e6705b0349e4c241f9132a6649977431 diff --git a/qtdeclarative b/qtdeclarative index 662c53dc..67cc0be4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 662c53dc583188d0278c86f59ab6b80056dbd419 +Subproject commit 67cc0be410e0325ff5c8757684cacd02eea91572 diff --git a/qtlocation b/qtlocation index 7e35bd3a..d26ef296 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7e35bd3a31341b9593134808b08ee8dee6951c10 +Subproject commit d26ef296c7f829b9edd505527b8986c5dba314fa diff --git a/qtmultimedia b/qtmultimedia index c5458cb2..20d546aa 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c5458cb29a74ee8757746fc63c8e29b3accd4975 +Subproject commit 20d546aa91202c242bd06e495aac0c8b1e65f0c0 diff --git a/qtnetworkauth b/qtnetworkauth index 3e927d64..40df5098 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3e927d64266aa51d1f4f853f3c905ffd4576b6bc +Subproject commit 40df50986eae2ebbe3a05321703829964e3bb7d2 diff --git a/qtquickcontrols b/qtquickcontrols index 490b0f38..da824463 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 490b0f38b64735230228b304f956a4c63c8a0895 +Subproject commit da824463ba84d64ee4918feb2cf0e83d835f4404 diff --git a/qtrepotools b/qtrepotools index f9c6da38..a29ca613 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 +Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3744d0c3..6fb859b1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3744d0c3c961049a84023b7f8567e48196475b2c +Subproject commit 6fb859b1c1d526dde91404814f1c2de09d0cb926 diff --git a/qtwayland b/qtwayland index a1e6810e..617b0b06 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a1e6810e6914b4b43d9f7f1ee195e75b8d4426ab +Subproject commit 617b0b063155523aa7affcdaa5aa3effac646124 diff --git a/qtwebengine b/qtwebengine index efb0cbc6..809afc26 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit efb0cbc61b64800b175d7b45ee4febe1462c26c1 +Subproject commit 809afc26fe0c47b249cf11376c8ea484a2bfaaf1 -- cgit v1.2.3 From 24de703f26d8dcedb17710189e90c31acfbb4f7c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 17 Mar 2019 21:45:53 +0100 Subject: Update submodules on 'dev' in qt5 Change-Id: I6c78b9e00e9bdbf579e8b423b42499bea822ceca Reviewed-by: Liang Qi --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index 50c73e50..ba11981f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 50c73e50d3f285f169896e82ca362f7c94f00c81 +Subproject commit ba11981f15dc37a464d2bebc79c06a4bc6928943 -- cgit v1.2.3 From c71f0041719f7ab58d4a5bf1b76cd2ac681486be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Thu, 14 Mar 2019 14:02:25 -0700 Subject: Provisioning: add dependency walker to win10 x86 Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..331de489 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" -- cgit v1.2.3 From 323dcdb60f041644d52e07d1235d87ff4999d3a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Mar 2019 16:14:01 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 4af8fcdc..e9868e15 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4af8fcdc05d0198a569e7c39fa934614bbe31803 +Subproject commit e9868e157b56eea991e34712eace5962d14543e6 diff --git a/qtactiveqt b/qtactiveqt index 4766c93e..922903ba 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4766c93e4df91ee3ecf510b5f011799e29f6093e +Subproject commit 922903ba18bab04e81686ab9a7d8a908d9f83e46 diff --git a/qtandroidextras b/qtandroidextras index 1c7de170..bc5e209e 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1c7de1701f1f75c2ce6cfff1baa6ab49ee669073 +Subproject commit bc5e209ee2b7652684c8f4efd18b6506231dbf82 diff --git a/qtbase b/qtbase index 912bcf0f..b0145f02 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 912bcf0f0df166705f9bfd0a74ab6afcf7b42f1b +Subproject commit b0145f029cdde7ae8475b85a20099f115879496e diff --git a/qtcanvas3d b/qtcanvas3d index 18e0ed4f..9bd0368d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 18e0ed4fecb9642464c989a6c716a2b5cf400108 +Subproject commit 9bd0368d77022012a0283d8e1635204e6556c3ef diff --git a/qtcharts b/qtcharts index 203508d4..a3d050ae 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 203508d4aff39cfb7d8a7f3192884a190f203020 +Subproject commit a3d050aeca7e9c0b169938b0d27b87d005500ad4 diff --git a/qtconnectivity b/qtconnectivity index 3f9ba9c0..16f033fb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3f9ba9c07322d90f8f918d9e144e84d422e4cfbd +Subproject commit 16f033fb13a3005eefbe8b7b6ccc52bfda08649e diff --git a/qtdatavis3d b/qtdatavis3d index e91e0d04..111484f3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e91e0d04e214a372bf0c26b6f2edda1d7c47c552 +Subproject commit 111484f3e3c0ac79a7c672d66bf8bd54d711e5ca diff --git a/qtdeclarative b/qtdeclarative index c911349b..710580aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c911349b8bdcc7f798091eb6acd20395883b2000 +Subproject commit 710580aa84c5c3273e883d9e650f3159ad8250f3 diff --git a/qtdoc b/qtdoc index 323572c5..b1074519 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 323572c586c06b20a8ddccaed0add6deb9283903 +Subproject commit b107451957d8c74eb70d660d8313b4bc0dcf200b diff --git a/qtgamepad b/qtgamepad index 45feea99..9f810a34 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 45feea99efe1b28b71b649b26790616a20f20d14 +Subproject commit 9f810a34af4ad80023800b96f73e344bae7ef5bd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 23a9a049..72f39883 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 23a9a04935c28110c2cff0d71873573d8f8f51c3 +Subproject commit 72f39883c7beb7ea9bd7ccb6ecf29212cfd43e06 diff --git a/qtimageformats b/qtimageformats index 0e8422be..d83c2212 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0e8422bedc8c84ff7c08c6b3163329e82c2007dd +Subproject commit d83c22120c546dd9612d41b4acb02e489cd0d330 diff --git a/qtlocation b/qtlocation index 628cf98e..2bf874e5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 628cf98e820f552f228d6f71c770c293fce83a79 +Subproject commit 2bf874e5e2b6a08ee12d0810d67d3c7ecf1e4bfa diff --git a/qtmacextras b/qtmacextras index 18594a39..80eae30a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 18594a3928dbc82597cf6d9fb90ca07d2a67bcb1 +Subproject commit 80eae30a82bcecddc46479aa0ec08ca468bb8eac diff --git a/qtmultimedia b/qtmultimedia index 09490d1a..935967a4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 09490d1ac6294173004f8f5b948dea9a1e412d3d +Subproject commit 935967a453b47ae7c8e9ad3d94eef3813eab58db diff --git a/qtnetworkauth b/qtnetworkauth index 83633211..c03bd32d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8363321174f64a1497952d2d7fec895a2a7e18f3 +Subproject commit c03bd32dc38356b5de7f0507253c9ba901cee47c diff --git a/qtpurchasing b/qtpurchasing index 098dd780..172df3e3 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 098dd780b7e773f3e945c6e1b4b7fef51fb0a446 +Subproject commit 172df3e3c8822b3458207210b6180df22b2f3e6e diff --git a/qtqa b/qtqa index 507202b4..dc4cbd9f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af +Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 diff --git a/qtquickcontrols b/qtquickcontrols index 46425199..d601a02c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 46425199ebcdd4cb9facb471f67e17a941ca103f +Subproject commit d601a02c236314a023d5cea53d17747df6a9d84b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1ef176b5..0ee25027 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1ef176b5da8ad8d4993fa9296e64e44ee8de6560 +Subproject commit 0ee25027edf1be38412e2a397c1c0a71d2bd146b diff --git a/qtremoteobjects b/qtremoteobjects index 7dd6dda4..9ac11de4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7dd6dda47a1eec17a7193455df1087c361d975b5 +Subproject commit 9ac11de4f66ca666bbf00832c5a63691960302c4 diff --git a/qtrepotools b/qtrepotools index f9c6da38..a29ca613 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9c6da38f70d9bf95937a5de8269e0f8d52600a4 +Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 diff --git a/qtscript b/qtscript index a122caec..19a25771 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a122caecff790a82f707894fa9db72afe91fcb7e +Subproject commit 19a2577178e7dc63d7fd6981193484f3ac160acd diff --git a/qtscxml b/qtscxml index dca1cd7c..ef4b9753 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 +Subproject commit ef4b9753f5fce47977f498c7206c98f1de3f633b diff --git a/qtsensors b/qtsensors index 7792137f..d0e95984 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7792137f3fcd400f3933e8f7f328b35aa0586f81 +Subproject commit d0e959844d60a547430cd7731d66452306561159 diff --git a/qtserialbus b/qtserialbus index 670f912f..82232b93 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 670f912fbc08002ac063504755fc7705931e0d6e +Subproject commit 82232b93711a0a747a82d1378f23a4c5db80746d diff --git a/qtserialport b/qtserialport index b43e8fa2..86c67437 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b43e8fa213ae54a09f5ddb6ce847bcbefcd0dfe6 +Subproject commit 86c674377344871ff307972f249f6383b1ee9cab diff --git a/qtspeech b/qtspeech index ca42f92a..3f956ce7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ca42f92ab22c26fbcd6b1408ef57ed5199313456 +Subproject commit 3f956ce7e7488ec88748a234ec0d8e1a8bd661ce diff --git a/qtsvg b/qtsvg index 6f152f87..a042c6ea 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6f152f87dbbd47acc58458d636ce5d1cc181b8fd +Subproject commit a042c6ea6cdf465eb47c26e11c1c929b5afe0588 diff --git a/qttools b/qttools index b4597180..c7dbb12a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b4597180191734ca128772d2b8547c6e6c08efa2 +Subproject commit c7dbb12a734b4203c3613ae3950b2e7729643d66 diff --git a/qttranslations b/qttranslations index 85e12b88..309333c0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 85e12b885e93a9f086b6a29f3cfb4a9a632013f4 +Subproject commit 309333c0d01046af1e5e8ae3cbf607eb9e081088 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eea791e1..a50ec397 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eea791e14a4e2c94ba3ac292292b76b05d56385c +Subproject commit a50ec39770c2e6c811bd65164b177f71d249f451 diff --git a/qtwayland b/qtwayland index 7206b4e8..4cba9d59 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7206b4e8b6e10f5623b19ca132f538066c96aab5 +Subproject commit 4cba9d595311ac6040bf93450d1fb09ec0a3d9f4 diff --git a/qtwebchannel b/qtwebchannel index d14c6aa5..efccc2b6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 +Subproject commit efccc2b6f12005b2d5397aef1e2822a2fc699339 diff --git a/qtwebengine b/qtwebengine index 2bf39d83..cbeef3ee 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2bf39d83a532a7fa69adc99caafaa523276b03c5 +Subproject commit cbeef3ee920576d668664ca2e0b8a55ae307959a diff --git a/qtwebsockets b/qtwebsockets index 9a0a655b..db90e6d4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9a0a655b51086045ce86c9d001d34738d84d27ff +Subproject commit db90e6d410314c33aff7031f98d178cdafdda678 diff --git a/qtwebview b/qtwebview index fc039435..ebb9acb9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fc039435b57bb5860ee3c59542d29b106071ffb5 +Subproject commit ebb9acb99b640549742c579c73e11cbcd371497c diff --git a/qtwinextras b/qtwinextras index f2dc1d1a..45bae081 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 +Subproject commit 45bae08122145a770601b3898d86532b9261b670 diff --git a/qtx11extras b/qtx11extras index 16528689..ab83a657 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 165286899e3426730e5dfcd155f92b571c978416 +Subproject commit ab83a6578cddfe9750e2df41a95c8692bdf13ed8 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e2450f4..df6fe145 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e2450f4559f03a480e37318084bab99fdc128fc +Subproject commit df6fe14535fb25305321fd278926ad2b4de3e3bb -- cgit v1.2.3 From 209b8117bd9c8ce3814a0ee70a4be476dc21eaf1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Mar 2019 14:29:14 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index e9868e15..fa12f14b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e9868e157b56eea991e34712eace5962d14543e6 +Subproject commit fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 diff --git a/qtactiveqt b/qtactiveqt index 922903ba..0a091107 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 922903ba18bab04e81686ab9a7d8a908d9f83e46 +Subproject commit 0a0911079d25b529b102fb2c4ba2de2cb45b9e5d diff --git a/qtandroidextras b/qtandroidextras index bc5e209e..5e920ecf 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit bc5e209ee2b7652684c8f4efd18b6506231dbf82 +Subproject commit 5e920ecff160ddf7374023802918385ad699d786 diff --git a/qtbase b/qtbase index b0145f02..12978d4a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0145f029cdde7ae8475b85a20099f115879496e +Subproject commit 12978d4ad03af753130ba7c40b6203491cd86cd5 diff --git a/qtcanvas3d b/qtcanvas3d index 9bd0368d..ad4ac1b1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9bd0368d77022012a0283d8e1635204e6556c3ef +Subproject commit ad4ac1b1493cc637ab7280196a948fac9bef091e diff --git a/qtcharts b/qtcharts index a3d050ae..b6fe3127 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a3d050aeca7e9c0b169938b0d27b87d005500ad4 +Subproject commit b6fe3127201616fbbfd120be9c650445e583dd84 diff --git a/qtconnectivity b/qtconnectivity index 16f033fb..c488aedb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 16f033fb13a3005eefbe8b7b6ccc52bfda08649e +Subproject commit c488aedb42cda76085cfc0ed2602c34c3b5353a6 diff --git a/qtdatavis3d b/qtdatavis3d index 111484f3..c71ab9eb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 111484f3e3c0ac79a7c672d66bf8bd54d711e5ca +Subproject commit c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c diff --git a/qtdeclarative b/qtdeclarative index 710580aa..d47f0ce2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 710580aa84c5c3273e883d9e650f3159ad8250f3 +Subproject commit d47f0ce2cb6d6fb2c0d0a449d17d8c1dacbbcbe4 diff --git a/qtdoc b/qtdoc index b1074519..9c821c6d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b107451957d8c74eb70d660d8313b4bc0dcf200b +Subproject commit 9c821c6dae5a624f13d0c04e1d80aa804ed540c9 diff --git a/qtgamepad b/qtgamepad index 9f810a34..cd571466 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 9f810a34af4ad80023800b96f73e344bae7ef5bd +Subproject commit cd571466dc25674b25f34a3e2476c6a0b53dd25f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 72f39883..53d133c5 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 72f39883c7beb7ea9bd7ccb6ecf29212cfd43e06 +Subproject commit 53d133c517d8bec7e79d95cbd326cbc022d3b8c9 diff --git a/qtimageformats b/qtimageformats index d83c2212..4b0d658f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d83c22120c546dd9612d41b4acb02e489cd0d330 +Subproject commit 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a diff --git a/qtlocation b/qtlocation index 2bf874e5..6e02f895 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2bf874e5e2b6a08ee12d0810d67d3c7ecf1e4bfa +Subproject commit 6e02f895a8f3a74503971dd8df02cfafd46281f8 diff --git a/qtmacextras b/qtmacextras index 80eae30a..cc0df66a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 80eae30a82bcecddc46479aa0ec08ca468bb8eac +Subproject commit cc0df66a3e3ed4099fba96eeb287239405d49a19 diff --git a/qtmultimedia b/qtmultimedia index 935967a4..d665520e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 935967a453b47ae7c8e9ad3d94eef3813eab58db +Subproject commit d665520e8bd23121160d82cada34ff625e0d0cfe diff --git a/qtnetworkauth b/qtnetworkauth index c03bd32d..88fa9ac9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c03bd32dc38356b5de7f0507253c9ba901cee47c +Subproject commit 88fa9ac94241a182f8ad92a692eccabbc0caa9cc diff --git a/qtpurchasing b/qtpurchasing index 172df3e3..634f8e54 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 172df3e3c8822b3458207210b6180df22b2f3e6e +Subproject commit 634f8e549291b96434941b1dc29d665fdf29f980 diff --git a/qtquickcontrols b/qtquickcontrols index d601a02c..c901f6d2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d601a02c236314a023d5cea53d17747df6a9d84b +Subproject commit c901f6d2ee7f73f58881424b05d57360720fa7d9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0ee25027..27e030f2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0ee25027edf1be38412e2a397c1c0a71d2bd146b +Subproject commit 27e030f24b05dac56189c34951da38fd68dc64a1 diff --git a/qtremoteobjects b/qtremoteobjects index 9ac11de4..119b222d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9ac11de4f66ca666bbf00832c5a63691960302c4 +Subproject commit 119b222dd5ee8f4410f87c5854e6e9ee65436309 diff --git a/qtscript b/qtscript index 19a25771..6522303c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 19a2577178e7dc63d7fd6981193484f3ac160acd +Subproject commit 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b diff --git a/qtscxml b/qtscxml index ef4b9753..554ac455 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ef4b9753f5fce47977f498c7206c98f1de3f633b +Subproject commit 554ac4551c154f39de2917877b189b74e4464d3b diff --git a/qtsensors b/qtsensors index d0e95984..f5281044 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d0e959844d60a547430cd7731d66452306561159 +Subproject commit f528104474dd74e34ea6a01da096e7c31730c01a diff --git a/qtserialbus b/qtserialbus index 82232b93..4a52df0a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 82232b93711a0a747a82d1378f23a4c5db80746d +Subproject commit 4a52df0a7d5e0bc825a39d8f1f3764f45908fe75 diff --git a/qtserialport b/qtserialport index 86c67437..0ab5636a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 86c674377344871ff307972f249f6383b1ee9cab +Subproject commit 0ab5636aee10d8578307beb90c69e27f7f69574b diff --git a/qtspeech b/qtspeech index 3f956ce7..5df003ab 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 3f956ce7e7488ec88748a234ec0d8e1a8bd661ce +Subproject commit 5df003abcb564fef4074a73969d3ca3aaf8acf1d diff --git a/qtsvg b/qtsvg index a042c6ea..d477ec8f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a042c6ea6cdf465eb47c26e11c1c929b5afe0588 +Subproject commit d477ec8f40b28caf3a216d9e8550d8871d5131fb diff --git a/qttools b/qttools index c7dbb12a..44348513 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c7dbb12a734b4203c3613ae3950b2e7729643d66 +Subproject commit 44348513f90bd24674172b87a97e0c8b615a555a diff --git a/qttranslations b/qttranslations index 309333c0..7baf16d1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 309333c0d01046af1e5e8ae3cbf607eb9e081088 +Subproject commit 7baf16d13b463ed86879e8a109ff3b4ba4ae8e46 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a50ec397..21558bce 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a50ec39770c2e6c811bd65164b177f71d249f451 +Subproject commit 21558bcead96716607e670840c63213d6eb4d8c9 diff --git a/qtwayland b/qtwayland index 4cba9d59..7a0956a8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4cba9d595311ac6040bf93450d1fb09ec0a3d9f4 +Subproject commit 7a0956a89a559e5a73a659fcc08001cefa01d9bd diff --git a/qtwebchannel b/qtwebchannel index efccc2b6..05327921 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit efccc2b6f12005b2d5397aef1e2822a2fc699339 +Subproject commit 05327921fd125a6e33cb32344ac54a7b023f8c62 diff --git a/qtwebengine b/qtwebengine index cbeef3ee..3efb842b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cbeef3ee920576d668664ca2e0b8a55ae307959a +Subproject commit 3efb842be6e2c663b75f2e920fca00dd71da2ce7 diff --git a/qtwebglplugin b/qtwebglplugin index b1662da5..10a64558 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit b1662da58d05dd53b5d4c84a3518c65f417cefd8 +Subproject commit 10a64558ce927e2df0f2dfe7ff3d786d4737c06e diff --git a/qtwebsockets b/qtwebsockets index db90e6d4..dd00a38e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit db90e6d410314c33aff7031f98d178cdafdda678 +Subproject commit dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff diff --git a/qtwebview b/qtwebview index ebb9acb9..8df88a17 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ebb9acb99b640549742c579c73e11cbcd371497c +Subproject commit 8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e diff --git a/qtwinextras b/qtwinextras index 45bae081..4e5f9b48 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 45bae08122145a770601b3898d86532b9261b670 +Subproject commit 4e5f9b48b1d828bd15c32cd98d9878b0ed892dd9 diff --git a/qtx11extras b/qtx11extras index ab83a657..11ee82ab 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ab83a6578cddfe9750e2df41a95c8692bdf13ed8 +Subproject commit 11ee82ab6c256e50a39758272f1a8ca19dc8d4f3 diff --git a/qtxmlpatterns b/qtxmlpatterns index df6fe145..595e7cf5 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit df6fe14535fb25305321fd278926ad2b4de3e3bb +Subproject commit 595e7cf516be4667b41ed358eabafcbf2f23ef5c -- cgit v1.2.3 From 3003529631f697c350c5aeb4a833dc92dce84d6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Mar 2019 14:02:57 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I0c15efb52ebac506133653336a16d09174bb938f Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qtbase b/qtbase index 4554fa7b..1d5f9fcc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4554fa7b191566df0a6c07e686c642c78eb88095 +Subproject commit 1d5f9fcc8a14e4826943a913fe22e819a0837b80 diff --git a/qtcharts b/qtcharts index 6a4c59bd..fc535855 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6a4c59bd9b583ffe83d131b5e5647f49672deab3 +Subproject commit fc535855c4f7e2b457b2a71fb3b687855cbfc958 diff --git a/qtconnectivity b/qtconnectivity index bb80398c..4747a72d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bb80398caacdae6e319cb17d4953e3800ff277f2 +Subproject commit 4747a72d9a69f53760793ce0c0bb0154e43eca45 diff --git a/qtdatavis3d b/qtdatavis3d index 4d88f5b7..f171e624 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4d88f5b7dacfd1f8c9f60aacd0f75b027fffbc51 +Subproject commit f171e624934ffa6d79c1eb9c9134a8ecf2101a7e diff --git a/qtdeclarative b/qtdeclarative index dc3e3090..40e149f5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dc3e3090d21339d78abc706369117b3396c843af +Subproject commit 40e149f5fa67967e890b8f9d09cbb00cb2f62259 diff --git a/qtdoc b/qtdoc index 14ea2e1a..0ead042b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 14ea2e1a53b92c50566a48e7eece1198fd518c63 +Subproject commit 0ead042bef8132544c9c5e21d4030ca3bbbc3c28 diff --git a/qtgamepad b/qtgamepad index e36343e5..846bb179 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e36343e5b175bc44fc9dc3289533416b47c207e7 +Subproject commit 846bb17980e928b4e444ce0430dfb924b73bee4b diff --git a/qtlocation b/qtlocation index 9f86b735..b5e8d016 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9f86b7353f1cdb01fe98efa8130fb6ccb5b4337d +Subproject commit b5e8d016ec819183d11307698e9e48b894321b9e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4a434b19..acebfc7f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4a434b19c347a6014f42cbcf0f1493d689e579fc +Subproject commit acebfc7f1e50386a83c1f039399cf5cf914b893e diff --git a/qtremoteobjects b/qtremoteobjects index f7921b5f..62a62403 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f7921b5f67cfe2e83d282f470128524f3fdee238 +Subproject commit 62a6240355894764c778715f6029d99c9d9e45b8 diff --git a/qttools b/qttools index 46ddc942..da6c8374 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 46ddc9424ddd64316234194c31ac4ffad6cbab07 +Subproject commit da6c83745fad37229f879d6e0b4fc74c114d5c2b diff --git a/qttranslations b/qttranslations index f74de77d..c4478f4b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f74de77d311235cebc1f0769e48aa22f420d52d4 +Subproject commit c4478f4b15b17f85f49d53de4cfb238bd791d2bf diff --git a/qtwayland b/qtwayland index 26fccd2e..c0905957 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 26fccd2e63ae82d1883077dfb14b7720b3c93ef1 +Subproject commit c0905957be0d7db90c9d9f05069a259575753dfe diff --git a/qtwebengine b/qtwebengine index 31fe2e8c..d5a479a7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 31fe2e8c1eda4a805882df79bb8cb33f06f1c799 +Subproject commit d5a479a720ee76fae9fa7b0f7b6b3d0a61718ff0 diff --git a/qtwebsockets b/qtwebsockets index da87e40e..72331822 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit da87e40ed671757bbdcd83d45018467918fd94e7 +Subproject commit 723318223fbdfda0ccc2f2fa539cf14c6ef5c92f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0a8a27a0..6ef1a201 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0a8a27a0f1543423ea236a2e5ee5d851337e2481 +Subproject commit 6ef1a201e1608ec41d71425bdb32155e002cd934 -- cgit v1.2.3 From d8a1801f1d8600983dd81ce7e06899cb4a10a1dc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Mar 2019 22:01:07 +0100 Subject: Update submodules on 'dev' in qt5 Change-Id: I46929f3d189bc07ee3a9f95cb539bdae57d6d10d Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qt3d b/qt3d index ba11981f..b9ac4faf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ba11981f15dc37a464d2bebc79c06a4bc6928943 +Subproject commit b9ac4faf28cc27849a392019564209b319f90568 diff --git a/qtactiveqt b/qtactiveqt index d9a196a9..9698bf05 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d9a196a9a51d2a40ec7a64cacacab5608195be86 +Subproject commit 9698bf0595804007d570cf194e2e2499bb432df0 diff --git a/qtandroidextras b/qtandroidextras index fe09a2dc..04ed4ad6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit fe09a2dc3edb4b9a4377b25847f0c684c17fcc17 +Subproject commit 04ed4ad6ffafc7d11205751b3ebeab17601ca51d diff --git a/qtbase b/qtbase index 11b9c813..6a210e03 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 11b9c813e6705b0349e4c241f9132a6649977431 +Subproject commit 6a210e0329aaf697e6760e2019e0cb0f9236ba14 diff --git a/qtcharts b/qtcharts index 5ef80b87..b957ead1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5ef80b87d3961ca84859c2e95422820718d76f74 +Subproject commit b957ead17811879eb4ed513d4a78696c51de76d9 diff --git a/qtconnectivity b/qtconnectivity index ead0cf31..5396e6c8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ead0cf31f9611b6ecefc0f9985cf07306c89e70a +Subproject commit 5396e6c894e73fc9a5815052f683103646a3f3cd diff --git a/qtdatavis3d b/qtdatavis3d index 452cac27..787dc643 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 452cac276b493b6e9d6f1864eecaa97250cefd8b +Subproject commit 787dc6435068920d0f5709928222620da70211f0 diff --git a/qtdeclarative b/qtdeclarative index 67cc0be4..c32b109e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 67cc0be410e0325ff5c8757684cacd02eea91572 +Subproject commit c32b109e9dea44c6775c2dbf8f164870c1dc8971 diff --git a/qtdoc b/qtdoc index 695b871c..be70244e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 695b871c06299fff96373f07d08a3074490d45fc +Subproject commit be70244e59a619510a570cd393dcad9880fc0c7d diff --git a/qtgamepad b/qtgamepad index e09f04e8..52fb1bf0 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e09f04e8b2e0593efcd1bbbdeacadde58521d1fd +Subproject commit 52fb1bf06f469922c3414821b6a0ea05edc0d15f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5c8530c1..8022fa1e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5c8530c1fc4b9a6e52043353b97bfeba9900dc7a +Subproject commit 8022fa1e09af2a3077050840936f2067e94e79fc diff --git a/qtimageformats b/qtimageformats index 147cd191..b1c98ac4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 147cd191d68a248f257317f5403fe0b3b9d6cbf2 +Subproject commit b1c98ac48affa7b15104d8e29bf4b9ad664b84e1 diff --git a/qtlocation b/qtlocation index d26ef296..6cfd503e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d26ef296c7f829b9edd505527b8986c5dba314fa +Subproject commit 6cfd503ef805651bfe9a112bfdb937f0092577ce diff --git a/qtmacextras b/qtmacextras index c4353f2f..81bee847 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit c4353f2fbcc444aa349648e1c23e49156ae59465 +Subproject commit 81bee847c3e67da6da91fa3549c5c8d5f8d6b291 diff --git a/qtpurchasing b/qtpurchasing index 768c533f..e5eb273f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 768c533feb7116d906e1fbd2775cb59298e46931 +Subproject commit e5eb273fcbd960afd6a8e3eac2ed0908a1cecfa8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 745ff8a9..1b2e0d50 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 745ff8a9186d40c5c53f8ffa0a26d2730e6c214d +Subproject commit 1b2e0d509ed8df858a621908936114544cddc55f diff --git a/qtscxml b/qtscxml index f149bb9d..dfd2bdf6 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f149bb9d9afbe7a3d81741e95a121b78be25bbdf +Subproject commit dfd2bdf6e420625bcec346db4ea4aba702aa3318 diff --git a/qtserialbus b/qtserialbus index 8dd3e459..187999b0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8dd3e45961b7098bc50649cfb8191eb3cbdf19e8 +Subproject commit 187999b06ee355d482374a3ea4b417d6d8185983 diff --git a/qtserialport b/qtserialport index 0da18e91..a3b7daae 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0da18e91f44ac916540450a33d5c64b59d347934 +Subproject commit a3b7daaef277a53206860f639d4f67f537ff6d91 diff --git a/qtsvg b/qtsvg index b46f7ace..ef8e688d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b46f7ace38c6fbb50e7689842a5c38a59279824f +Subproject commit ef8e688d3bc77a3d09b0b3caaf146fd9de0c8146 diff --git a/qttools b/qttools index 62e4e202..599973a4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 62e4e2021bc1e68ae9bd2e9b49556282cfe816b9 +Subproject commit 599973a4a91ddc1bc3d1eed651637e4b05f49bfa diff --git a/qtwayland b/qtwayland index 617b0b06..77e8ee63 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 617b0b063155523aa7affcdaa5aa3effac646124 +Subproject commit 77e8ee63dc9ad0a4c139f35f8cf078d1a5bd315c diff --git a/qtwebsockets b/qtwebsockets index 1668c311..6b06d3a2 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1668c31166f83189c30aaeb8aed07e014259e963 +Subproject commit 6b06d3a25c216a4562e2270f987bff61abe02103 diff --git a/qtwinextras b/qtwinextras index a0892744..12332956 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a0892744250fb0352a710ffd15a0024165b01e08 +Subproject commit 123329563e4b9b0cca81f52615f3b4afe7c304ba diff --git a/qtxmlpatterns b/qtxmlpatterns index bc4290cd..6956f20f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit bc4290cde83470dd72eb49e8cf6275f7b7a70f38 +Subproject commit 6956f20f97280cf915199984de0bf5d7bb6161b8 -- cgit v1.2.3 From 7cc57995bfd265a9c230d2e8c977b519de943dcc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 09:52:34 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 12978d4a..4d77c375 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12978d4ad03af753130ba7c40b6203491cd86cd5 +Subproject commit 4d77c37522b51861037f0ec3ee9d4d13951672ff diff --git a/qtdeclarative b/qtdeclarative index d47f0ce2..a5b4a8db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d47f0ce2cb6d6fb2c0d0a449d17d8c1dacbbcbe4 +Subproject commit a5b4a8dbaa2f6535fa659fb95b75c059a04c6235 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 27e030f2..5a07a970 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 27e030f24b05dac56189c34951da38fd68dc64a1 +Subproject commit 5a07a970fa9d73fc2c4da8966fadcb35d142c7f5 diff --git a/qtwebengine b/qtwebengine index 3efb842b..54ac91fd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3efb842be6e2c663b75f2e920fca00dd71da2ce7 +Subproject commit 54ac91fd60ba0e84be239cefa1b56a489c420f9e -- cgit v1.2.3 From a97d669a2055b6e989e5d274da6cb14fafc66041 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 12 Mar 2019 11:31:53 +0200 Subject: Provisioning: Remove certificate printing to log macOS openssl provisioning printed certificates to log. This patch prevent printing certificates to log by redirecting it to /dev/null Task-number: QTQAINFRA-2841 Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74 Reviewed-by: Iikka Eklund Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/macos/install_openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh index 15f02ffd..3b1978e2 100755 --- a/coin/provisioning/common/macos/install_openssl.sh +++ b/coin/provisioning/common/macos/install_openssl.sh @@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null sudo rm -rf /tmp/openssl-$opensslVersion -- cgit v1.2.3 From 665703efc9dc150862e4f596b713ddbef5910fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 22 Mar 2019 14:06:56 +0200 Subject: Remove 32bit MSVC 2015 from the CI Task-number: QTQAINFRA-2251 Change-Id: I4006c7390759e2eb357309de36eb23af007a576e Reviewed-by: Tim Jenssen Reviewed-by: Alex Blasche Reviewed-by: Friedemann Kleint --- coin/platform_configs/qt5.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3de18a74..ce289290 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -- cgit v1.2.3 From b02d849d764c794224db011fd4a746f477e31bc4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 20:55:48 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 4d77c375..2f97a050 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4d77c37522b51861037f0ec3ee9d4d13951672ff +Subproject commit 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e diff --git a/qtcharts b/qtcharts index b6fe3127..c0f0d22a 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b6fe3127201616fbbfd120be9c650445e583dd84 +Subproject commit c0f0d22a1ae85c7efafb4cee6d0e59effb68262c diff --git a/qtdeclarative b/qtdeclarative index a5b4a8db..42ed40cf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a5b4a8dbaa2f6535fa659fb95b75c059a04c6235 +Subproject commit 42ed40cf0abd0155d6e6d1ef01faf9bded065588 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 53d133c5..e7ab193d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 53d133c517d8bec7e79d95cbd326cbc022d3b8c9 +Subproject commit e7ab193d855806d7333577ad7d9d15165d1b5cf8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5a07a970..5135bec5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5a07a970fa9d73fc2c4da8966fadcb35d142c7f5 +Subproject commit 5135bec50762955b3a1138ecda10214a9d0bf62a diff --git a/qttools b/qttools index 44348513..9c7502b0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 44348513f90bd24674172b87a97e0c8b615a555a +Subproject commit 9c7502b0e5056da021ace0195e53d5b7b410120b diff --git a/qtwebengine b/qtwebengine index 54ac91fd..1fe5566c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 54ac91fd60ba0e84be239cefa1b56a489c420f9e +Subproject commit 1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b -- cgit v1.2.3 From eb3c52455cd2a680ecab88105116293523bf07c9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2019 13:25:40 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I2a21f0c7eabe7697691bbe330fd0c74058997bb1 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 1d5f9fcc..58a87609 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d5f9fcc8a14e4826943a913fe22e819a0837b80 +Subproject commit 58a87609a6c963416e2483e57e6f2a80552ec945 diff --git a/qtdeclarative b/qtdeclarative index 40e149f5..56b3232a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 40e149f5fa67967e890b8f9d09cbb00cb2f62259 +Subproject commit 56b3232a7d35fe2b856d1d87a7e1c59906b46681 diff --git a/qtdoc b/qtdoc index 0ead042b..864c88b9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0ead042bef8132544c9c5e21d4030ca3bbbc3c28 +Subproject commit 864c88b9a3ca93ebd300d7c180260087265937ef diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 44c54c6b..7d39bfe3 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 44c54c6b106c65ff21d636ce74c40fe5e602361b +Subproject commit 7d39bfe3304090ad7808a0886e249c8ecb5e06b2 diff --git a/qtlocation b/qtlocation index b5e8d016..63650309 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b5e8d016ec819183d11307698e9e48b894321b9e +Subproject commit 6365030928d3562258932647d3ade81d0a890137 diff --git a/qtwebengine b/qtwebengine index d5a479a7..f3f3279b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d5a479a720ee76fae9fa7b0f7b6b3d0a61718ff0 +Subproject commit f3f3279bec367bf3816377ac31a75c042648068f diff --git a/qtxmlpatterns b/qtxmlpatterns index 6ef1a201..ea54a864 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6ef1a201e1608ec41d71425bdb32155e002cd934 +Subproject commit ea54a86408c73340cdbfc5360209d3a01cc324c2 -- cgit v1.2.3 From 4d427ae04f73e3979b38a4e463ffa82bffbcbd03 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 23 Mar 2019 02:31:24 +0000 Subject: Update submodules on 'dev' in qt5 Change-Id: Ib8090cd0a47e284dc7197cf4614d63d2e2e127a9 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlottie | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 6a210e03..1e70781e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6a210e0329aaf697e6760e2019e0cb0f9236ba14 +Subproject commit 1e70781e7f0b012fcfbf85f86c24f3b46e362d4e diff --git a/qtdeclarative b/qtdeclarative index c32b109e..c740143a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c32b109e9dea44c6775c2dbf8f164870c1dc8971 +Subproject commit c740143ad6938bf1c81a40de73649e8664f6037f diff --git a/qtlottie b/qtlottie index 0278037c..b37f8db3 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0278037c6a91a916f790971eafbc2ca0f8a9e4a2 +Subproject commit b37f8db3e6b0ae172487c7798e1878ae24bfddb5 diff --git a/qtwebengine b/qtwebengine index 809afc26..432af50e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 809afc26fe0c47b249cf11376c8ea484a2bfaaf1 +Subproject commit 432af50e930b7f11455fc1daec17d9c215ea88ee -- cgit v1.2.3 From 4f268edc88f05aa8bf9c9ebbc1db50b7dd405a18 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 24 Mar 2019 02:31:11 +0000 Subject: Update submodules on 'dev' in qt5 Change-Id: I799f3265c9b6d28de248fc55685b77ea26039816 Reviewed-by: Liang Qi --- qtbase | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsensors | 2 +- qtspeech | 2 +- qtx11extras | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 1e70781e..461e89ee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1e70781e7f0b012fcfbf85f86c24f3b46e362d4e +Subproject commit 461e89ee1a53f7669e0215f9015380c4a9d62371 diff --git a/qtlocation b/qtlocation index 6cfd503e..82ba4956 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6cfd503ef805651bfe9a112bfdb937f0092577ce +Subproject commit 82ba495626a4b5bf6e934beb3ba518bcea88b732 diff --git a/qtmultimedia b/qtmultimedia index 20d546aa..195d03ab 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 20d546aa91202c242bd06e495aac0c8b1e65f0c0 +Subproject commit 195d03ab951f315d7a3fe5e36c35febaff22a47a diff --git a/qtnetworkauth b/qtnetworkauth index 40df5098..ab618fda 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 40df50986eae2ebbe3a05321703829964e3bb7d2 +Subproject commit ab618fdade4dc5071bc00b6ec0d430b0305e3d36 diff --git a/qtremoteobjects b/qtremoteobjects index c1e92756..0fa8bd7e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c1e92756b95f35dba09ddd48f2dfd645aea331d8 +Subproject commit 0fa8bd7e0a09476e87aaf91638cdd6bd6056624f diff --git a/qtscript b/qtscript index b494dc90..a103a589 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b494dc90e5fcc159d7ca85dc8a614039235651e8 +Subproject commit a103a589272c7eb2420f172ce76cc423e0028a71 diff --git a/qtsensors b/qtsensors index ae5af8ba..066174b9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ae5af8baa9c0323f1908a6d218c28f9c504bc778 +Subproject commit 066174b934a60d882016fa11af1dbb9eeb6ace33 diff --git a/qtspeech b/qtspeech index 2d642b77..8ebd72de 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2d642b774665087ad9f0ee541368b3ba5564e74f +Subproject commit 8ebd72de6526de76e2c7cfeacfd7a5cd4e8d96c1 diff --git a/qtx11extras b/qtx11extras index 4e35f08d..608acb19 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 4e35f08d17c277e36fa5fb636b374b3d1dceb764 +Subproject commit 608acb194e9305ec284a8634e1dac4f8d53ab30a -- cgit v1.2.3 From 35b489b1bd2357f1ba6aba0537751ad2eb2a856c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Mar 2019 10:18:14 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 2f97a050..a868942b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e +Subproject commit a868942b11a586861e167aaafaa9c65fde23e88d diff --git a/qtconnectivity b/qtconnectivity index c488aedb..d21da782 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c488aedb42cda76085cfc0ed2602c34c3b5353a6 +Subproject commit d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 diff --git a/qtdeclarative b/qtdeclarative index 42ed40cf..d8110b53 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42ed40cf0abd0155d6e6d1ef01faf9bded065588 +Subproject commit d8110b53ed9ee4d69b92e602e812c6311c1b863b diff --git a/qtimageformats b/qtimageformats index 4b0d658f..434aa248 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a +Subproject commit 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 diff --git a/qtlocation b/qtlocation index 6e02f895..5c3e3464 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6e02f895a8f3a74503971dd8df02cfafd46281f8 +Subproject commit 5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac diff --git a/qtmultimedia b/qtmultimedia index d665520e..c296df78 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d665520e8bd23121160d82cada34ff625e0d0cfe +Subproject commit c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a diff --git a/qtrepotools b/qtrepotools index a29ca613..df3090cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 +Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 diff --git a/qtserialbus b/qtserialbus index 4a52df0a..76cbf4b7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4a52df0a7d5e0bc825a39d8f1f3764f45908fe75 +Subproject commit 76cbf4b7d10db3aa8944c8480a6c504548f0e070 diff --git a/qttools b/qttools index 9c7502b0..9beac983 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9c7502b0e5056da021ace0195e53d5b7b410120b +Subproject commit 9beac9838510e94338377fcd1cfc68b371f32a86 diff --git a/qttranslations b/qttranslations index 7baf16d1..0987e6cb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7baf16d13b463ed86879e8a109ff3b4ba4ae8e46 +Subproject commit 0987e6cb7f415be17d1240c8cd71719f94a98f76 diff --git a/qtwebengine b/qtwebengine index 1fe5566c..dad0cfa3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b +Subproject commit dad0cfa3eba01b0dff698f457242f80f6eae4698 -- cgit v1.2.3 From b9e40e2fd7dc11ee3890994fc492a09f0bc705d2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Mar 2019 20:28:14 +0100 Subject: Update submodules on '5.12' in qt5 Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index fa12f14b..e84d8d2a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 +Subproject commit e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 diff --git a/qtbase b/qtbase index a868942b..958fa043 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a868942b11a586861e167aaafaa9c65fde23e88d +Subproject commit 958fa04327f4f3c29eb0e16cc448ef20c62e11a3 diff --git a/qtdeclarative b/qtdeclarative index d8110b53..aa51b3bf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d8110b53ed9ee4d69b92e602e812c6311c1b863b +Subproject commit aa51b3bf4ea854ffe7b39403289689daa428b221 diff --git a/qtdoc b/qtdoc index 9c821c6d..adaefd7c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9c821c6dae5a624f13d0c04e1d80aa804ed540c9 +Subproject commit adaefd7cb8ed0849cd0a36a95912e37b3b14d35a diff --git a/qtmultimedia b/qtmultimedia index c296df78..f4181938 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a +Subproject commit f41819387531a5ddfbad2e80ceec7b57a5ebb7c6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5135bec5..d0f6b286 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5135bec50762955b3a1138ecda10214a9d0bf62a +Subproject commit d0f6b28618f7252f3f7c915a6a91a153f350e354 diff --git a/qtscript b/qtscript index 6522303c..2379c9b9 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b +Subproject commit 2379c9b93792feb97d6cb871082aed0f7cbcbad8 diff --git a/qtserialbus b/qtserialbus index 76cbf4b7..d5b3a2b6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 76cbf4b7d10db3aa8944c8480a6c504548f0e070 +Subproject commit d5b3a2b6e6462f4ad46fce8f52539333b131dcad diff --git a/qttools b/qttools index 9beac983..50335cb2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9beac9838510e94338377fcd1cfc68b371f32a86 +Subproject commit 50335cb26bb88930f5e2a204642439cc9a4d2282 diff --git a/qtwebengine b/qtwebengine index dad0cfa3..1110b9b5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dad0cfa3eba01b0dff698f457242f80f6eae4698 +Subproject commit 1110b9b50e61bf2663e2037ce9e28e74a8943919 -- cgit v1.2.3 From 7eeee0df436c9b7422e91c43a89de5fdef8a102a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Mar 2019 10:41:45 +0100 Subject: Update submodules on '5.13' in qt5 Change-Id: I81587903b3fdf6d68c3e91d0c6d21c591e2746a3 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 822050ca..957cc79d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 822050cadf4f67f72e3b0ef108b547e8a85d6028 +Subproject commit 957cc79d4b5c36aa6b8dc99f73bd0b04b62d6898 diff --git a/qtandroidextras b/qtandroidextras index 15b2059e..be8e722b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 15b2059e73df2f103c7206dd8d8a14a1fa3ca7b6 +Subproject commit be8e722b492ec8c9c6480d68827b6ec0e83cc2d2 diff --git a/qtbase b/qtbase index 58a87609..a0446b13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 58a87609a6c963416e2483e57e6f2a80552ec945 +Subproject commit a0446b13982b8cd1c7d75df71c800c9343e8ab1e diff --git a/qtcharts b/qtcharts index fc535855..2286b0d6 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit fc535855c4f7e2b457b2a71fb3b687855cbfc958 +Subproject commit 2286b0d68cad71bd1c266070377c86ad961bf1ba diff --git a/qtconnectivity b/qtconnectivity index 4747a72d..845e185b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4747a72d9a69f53760793ce0c0bb0154e43eca45 +Subproject commit 845e185b2881210b8f3a0dc25926c3d74b0008bf diff --git a/qtdatavis3d b/qtdatavis3d index f171e624..7dc2d930 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f171e624934ffa6d79c1eb9c9134a8ecf2101a7e +Subproject commit 7dc2d9302347b87993f5cfed4be5d6b9c3e130bc diff --git a/qtdeclarative b/qtdeclarative index 56b3232a..4407f1f8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 56b3232a7d35fe2b856d1d87a7e1c59906b46681 +Subproject commit 4407f1f81813216bf64021eab7dcecc88d3056fe diff --git a/qtdoc b/qtdoc index 864c88b9..72682347 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 864c88b9a3ca93ebd300d7c180260087265937ef +Subproject commit 7268234726f41dec0615abfe651e882eef0cda48 diff --git a/qtgamepad b/qtgamepad index 846bb179..eb5cd84d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 846bb17980e928b4e444ce0430dfb924b73bee4b +Subproject commit eb5cd84d1fb2d602f2de8a7013498012b6b58d80 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7d39bfe3..085275b9 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7d39bfe3304090ad7808a0886e249c8ecb5e06b2 +Subproject commit 085275b92a55a21cbcf8d307a6f52804875deedd diff --git a/qtimageformats b/qtimageformats index 45e7c2b0..9293902f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 45e7c2b0b2221d1659b480d31d4f596d5ac3f444 +Subproject commit 9293902f325341f0c188bdf4f662c3a7d949a343 diff --git a/qtlocation b/qtlocation index 63650309..5389a65d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6365030928d3562258932647d3ade81d0a890137 +Subproject commit 5389a65dc7434c4ed269a5d0c5cb93f5b12823ba diff --git a/qtmacextras b/qtmacextras index 8eb192fe..03dd40f8 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8eb192fe9ed2583e21450a1e567b3d461398d322 +Subproject commit 03dd40f8bf0bf7cf10830a9fe04de63c0fd95e63 diff --git a/qtmultimedia b/qtmultimedia index 95b7fc49..b07a7d79 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 95b7fc4950c1f0d895896cf3086c69126d45e061 +Subproject commit b07a7d79f3080892d381c40ec79679450bda5431 diff --git a/qtnetworkauth b/qtnetworkauth index e3a77155..cf5741a4 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e3a77155253d40133476212713094c3bc897a938 +Subproject commit cf5741a44a6c337fa523080838d8e9220f4370c1 diff --git a/qtpurchasing b/qtpurchasing index 3402a9fd..12c4da76 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 3402a9fd2a98b2fa1c067b6560cb0adef507f796 +Subproject commit 12c4da762bd29399767538ca716189908e41cc5a diff --git a/qtquickcontrols b/qtquickcontrols index 35e83521..4bfe4b89 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 35e83521b6a4c9efd50d498b23892b81ebbf20e7 +Subproject commit 4bfe4b892cbbe1f1936d7caa0aac603258abc5df diff --git a/qtquickcontrols2 b/qtquickcontrols2 index acebfc7f..d9b0e2cd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit acebfc7f1e50386a83c1f039399cf5cf914b893e +Subproject commit d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 diff --git a/qtremoteobjects b/qtremoteobjects index 62a62403..09029d0c 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 62a6240355894764c778715f6029d99c9d9e45b8 +Subproject commit 09029d0c14c2101c98e038f46223595c5333f4cc diff --git a/qtrepotools b/qtrepotools index a29ca613..df3090cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 +Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 diff --git a/qtscript b/qtscript index 32845dc7..fdac5687 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 32845dc708f21cd814e4a091504b2cb016de86e0 +Subproject commit fdac568771dd146dac26cea47c83c8e2b9a1a240 diff --git a/qtscxml b/qtscxml index 133fe954..6581f591 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 133fe95450beaba4be3db584752d80adc37d5fff +Subproject commit 6581f5911eb1dec25fa4870aae8e70a58b6e8dfd diff --git a/qtsensors b/qtsensors index 3f28dbc2..27ad6151 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e +Subproject commit 27ad61518b47d34733ca18a9ad3da72a691d453d diff --git a/qtserialbus b/qtserialbus index c8c0d240..20f68cef 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8c0d240081b1f68fad0603c5658f9314acabe2e +Subproject commit 20f68cefe6d9a4c073721855053076cb63980a83 diff --git a/qtserialport b/qtserialport index a301e0ec..f47d1b9a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a301e0ec1af0d888c032978fa8bcb155560ddb43 +Subproject commit f47d1b9a11eb8c56afbd929285724f795097da09 diff --git a/qtspeech b/qtspeech index 44c23c8c..d6d6bae3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 44c23c8c1a3a78da27e33dd6a48dc57f9876ed37 +Subproject commit d6d6bae390b90ff341d08e7d4d51c4f7ccd972c2 diff --git a/qtsvg b/qtsvg index 82578970..f799d19d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 82578970d435e17738612c7bd6c1f4a9f58468cc +Subproject commit f799d19d6df12e20fc133ef8466d310427cc68ca diff --git a/qttools b/qttools index da6c8374..dea5f552 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit da6c83745fad37229f879d6e0b4fc74c114d5c2b +Subproject commit dea5f5524414e743e098151382e4d00a5b924bd1 diff --git a/qttranslations b/qttranslations index c4478f4b..8243693e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c4478f4b15b17f85f49d53de4cfb238bd791d2bf +Subproject commit 8243693e684f8b5d28ed09ffd80a6322c6134f68 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 51f7bb2d..e117cfe3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 51f7bb2dab3737670da4fb7bc94d5b437a07fc27 +Subproject commit e117cfe3be46ccb82b0b3a9674d65ffb0f49e4df diff --git a/qtwayland b/qtwayland index c0905957..59fcde2e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c0905957be0d7db90c9d9f05069a259575753dfe +Subproject commit 59fcde2e722ea6f7342ac9bf956f5f0b2911e7fd diff --git a/qtwebchannel b/qtwebchannel index 3809bdf1..6e3fb84e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3809bdf15524e65397447eb7ba62a289c5ef58d4 +Subproject commit 6e3fb84e6caa8c9bd4952bd647466469c5faf526 diff --git a/qtwebengine b/qtwebengine index f3f3279b..3fc22037 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f3f3279bec367bf3816377ac31a75c042648068f +Subproject commit 3fc220377455cb15a7e65cfc63707df552650887 diff --git a/qtwebglplugin b/qtwebglplugin index 31f06ca3..26e75b0e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 31f06ca32ebd87c5b1bad6882e2d0b4689c7e85a +Subproject commit 26e75b0e33d4480c891b669c34907ce3c0e7b5df diff --git a/qtwebsockets b/qtwebsockets index 72331822..d451e0af 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 723318223fbdfda0ccc2f2fa539cf14c6ef5c92f +Subproject commit d451e0af881365ba7524ed93e1ef3f68154c784b diff --git a/qtwebview b/qtwebview index cd0cb72a..f625019a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cd0cb72a2cd219af5faade928c06b61df715b14b +Subproject commit f625019aef6dd336ead142d61ed480469c8711ee diff --git a/qtwinextras b/qtwinextras index fe4c2bf0..49d744be 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fe4c2bf06610da5bb27e63dcd784e11724b06773 +Subproject commit 49d744be877b2a4cba3e306c4ab0056687179318 diff --git a/qtx11extras b/qtx11extras index 986ea0aa..431bd11f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 986ea0aa5ffe4d50623fedc7ab3e482aec99687a +Subproject commit 431bd11f304179c77f55edd07d68b02d8408a45c diff --git a/qtxmlpatterns b/qtxmlpatterns index ea54a864..c886d992 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit ea54a86408c73340cdbfc5360209d3a01cc324c2 +Subproject commit c886d992029740da0185fd2bf8a040c84156e73d -- cgit v1.2.3 From b9da3a4bdad241f477a390aa64ee32c7714f2df1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 30 Mar 2019 09:16:36 +0100 Subject: Update submodules on 'dev' in qt5 Change-Id: I393b5619168e820b3ffbcf7263c47c93abb81aa9 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 9698bf05..619d6d2f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9698bf0595804007d570cf194e2e2499bb432df0 +Subproject commit 619d6d2fe683cfb74ff8d45ec99e8570b5261b0e diff --git a/qtandroidextras b/qtandroidextras index 04ed4ad6..72e8372e 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 04ed4ad6ffafc7d11205751b3ebeab17601ca51d +Subproject commit 72e8372e7d15cfb5fff11ae9272398e8a2e32efd diff --git a/qtbase b/qtbase index 461e89ee..300940a6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 461e89ee1a53f7669e0215f9015380c4a9d62371 +Subproject commit 300940a6c9eb0f74cefda7d76a5d19f56ec50253 diff --git a/qtcharts b/qtcharts index b957ead1..a9149e59 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b957ead17811879eb4ed513d4a78696c51de76d9 +Subproject commit a9149e59b50f80381158158de35d8a8d63707747 diff --git a/qtconnectivity b/qtconnectivity index 5396e6c8..78b16fd7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5396e6c894e73fc9a5815052f683103646a3f3cd +Subproject commit 78b16fd70a799963db17c4581736c1dcf344d10b diff --git a/qtdatavis3d b/qtdatavis3d index 787dc643..8b639bba 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 787dc6435068920d0f5709928222620da70211f0 +Subproject commit 8b639bba537b8c916105f289583c2ef77ed444fe diff --git a/qtdeclarative b/qtdeclarative index c740143a..5cd819d2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c740143ad6938bf1c81a40de73649e8664f6037f +Subproject commit 5cd819d264a932eccbd9d155a81c3c07a2918433 diff --git a/qtdoc b/qtdoc index be70244e..330f3a52 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit be70244e59a619510a570cd393dcad9880fc0c7d +Subproject commit 330f3a52f7aba61dcf8b187235a5c0a3bd35f71a diff --git a/qtgamepad b/qtgamepad index 52fb1bf0..3cf4be21 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 52fb1bf06f469922c3414821b6a0ea05edc0d15f +Subproject commit 3cf4be211ad58425d89c238b23bec5cedd79c111 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 8022fa1e..dffbc2b1 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8022fa1e09af2a3077050840936f2067e94e79fc +Subproject commit dffbc2b18883630e4d47281145428bcc999bc490 diff --git a/qtimageformats b/qtimageformats index b1c98ac4..adcac668 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b1c98ac48affa7b15104d8e29bf4b9ad664b84e1 +Subproject commit adcac6683d4bf24ce2c87523110bf58ca71da8ee diff --git a/qtlocation b/qtlocation index 82ba4956..de390341 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 82ba495626a4b5bf6e934beb3ba518bcea88b732 +Subproject commit de39034175f6187d3d29786f467d11e985bf0cac diff --git a/qtlottie b/qtlottie index b37f8db3..c265782b 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b37f8db3e6b0ae172487c7798e1878ae24bfddb5 +Subproject commit c265782b178eb6654706c1ecc89f100b6c6c8a39 diff --git a/qtmacextras b/qtmacextras index 81bee847..944a5c66 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 81bee847c3e67da6da91fa3549c5c8d5f8d6b291 +Subproject commit 944a5c66b725d3fefa8989c74ed62e0395d6bcff diff --git a/qtmultimedia b/qtmultimedia index 195d03ab..f05ef30e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 195d03ab951f315d7a3fe5e36c35febaff22a47a +Subproject commit f05ef30ec1eacea7582b268d77a5e8654af2fdd5 diff --git a/qtnetworkauth b/qtnetworkauth index ab618fda..2b1e9bfe 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ab618fdade4dc5071bc00b6ec0d430b0305e3d36 +Subproject commit 2b1e9bfec5b6017f3e16dfc6c8df94523aefe286 diff --git a/qtpurchasing b/qtpurchasing index e5eb273f..0992ba9d 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e5eb273fcbd960afd6a8e3eac2ed0908a1cecfa8 +Subproject commit 0992ba9d0c78ab99fe7387d1e53cad0e9db0ff45 diff --git a/qtqa b/qtqa index dc4cbd9f..ba041bc9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 +Subproject commit ba041bc942056d52804acd5011ae5fe7877be045 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1b2e0d50..d8981425 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1b2e0d509ed8df858a621908936114544cddc55f +Subproject commit d8981425c33f3bae930f31fbb2cf804c7337f33a diff --git a/qtremoteobjects b/qtremoteobjects index 0fa8bd7e..dc67e73f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0fa8bd7e0a09476e87aaf91638cdd6bd6056624f +Subproject commit dc67e73ff326d0fcc12610f26b97ddf6ffa17bed diff --git a/qtrepotools b/qtrepotools index a29ca613..df3090cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 +Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 diff --git a/qtscript b/qtscript index a103a589..06386a0c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a103a589272c7eb2420f172ce76cc423e0028a71 +Subproject commit 06386a0c7bfe08f40b4ad090c79bcc09031fb8c0 diff --git a/qtscxml b/qtscxml index dfd2bdf6..844fae55 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dfd2bdf6e420625bcec346db4ea4aba702aa3318 +Subproject commit 844fae552b5a15901d7e0d337b37fc57589fe2c3 diff --git a/qtsensors b/qtsensors index 066174b9..3606a1a8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 066174b934a60d882016fa11af1dbb9eeb6ace33 +Subproject commit 3606a1a8de2583fd533fd5a3cd80dd79ebddea7b diff --git a/qtserialbus b/qtserialbus index 187999b0..960861ac 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 187999b06ee355d482374a3ea4b417d6d8185983 +Subproject commit 960861ac561f4bd4d8ce4fbe6d0643482d961f11 diff --git a/qtserialport b/qtserialport index a3b7daae..f03f1476 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a3b7daaef277a53206860f639d4f67f537ff6d91 +Subproject commit f03f1476fb1d95dff3dab3ecf2db8ca6edb0e013 diff --git a/qtspeech b/qtspeech index 8ebd72de..a448e945 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8ebd72de6526de76e2c7cfeacfd7a5cd4e8d96c1 +Subproject commit a448e94579ed5495b2bb2c3105b73ae5acb735de diff --git a/qtsvg b/qtsvg index ef8e688d..798f3010 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ef8e688d3bc77a3d09b0b3caaf146fd9de0c8146 +Subproject commit 798f3010b1b6fe14b3bb56f136b7f126b8144398 diff --git a/qttools b/qttools index 599973a4..175e1bbe 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 599973a4a91ddc1bc3d1eed651637e4b05f49bfa +Subproject commit 175e1bbe8ba890ea4d6d0d3ee01d7688c0725cfc diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6fb859b1..4caabe5c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6fb859b1c1d526dde91404814f1c2de09d0cb926 +Subproject commit 4caabe5ca5d0e89bdd27c5b489848cdcc331daff diff --git a/qtwayland b/qtwayland index 77e8ee63..80001cbf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 77e8ee63dc9ad0a4c139f35f8cf078d1a5bd315c +Subproject commit 80001cbf0451f4ba2a971fb20b80dc8e25ac604d diff --git a/qtwebchannel b/qtwebchannel index 8b701450..ead6315c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8b701450aeceb878784879eaf65dc42d5befd3a5 +Subproject commit ead6315cc9624322ed5bca8e34cf426d0fa9159b diff --git a/qtwebengine b/qtwebengine index 432af50e..1b780f07 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 432af50e930b7f11455fc1daec17d9c215ea88ee +Subproject commit 1b780f07367ad98f1d812479a659d736d65ef54a diff --git a/qtwebsockets b/qtwebsockets index 6b06d3a2..f7a10a2d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6b06d3a25c216a4562e2270f987bff61abe02103 +Subproject commit f7a10a2d25871b4209d4acb723a14422fd24b97e diff --git a/qtwebview b/qtwebview index 8837eaa8..9dcc8033 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8837eaa817274cd0c896237ea37d5ac3095359c1 +Subproject commit 9dcc803346ab9c999ada37e06e2a508dc61307f5 diff --git a/qtwinextras b/qtwinextras index 12332956..864807b5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 123329563e4b9b0cca81f52615f3b4afe7c304ba +Subproject commit 864807b583c0538456f9988a7305d552ba5fba70 diff --git a/qtx11extras b/qtx11extras index 608acb19..e1e4d843 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 608acb194e9305ec284a8634e1dac4f8d53ab30a +Subproject commit e1e4d843a0d9b18d29c4c8e45bc3c1e5fcabc863 diff --git a/qtxmlpatterns b/qtxmlpatterns index 6956f20f..781c88be 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6956f20f97280cf915199984de0bf5d7bb6161b8 +Subproject commit 781c88be5ff94f092f8f7df84a07147a43b217a2 -- cgit v1.2.3 From 2f59bd5fbe582485d7e077529e61787b0a7bb317 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 31 Mar 2019 02:31:02 +0000 Subject: Update submodules on 'dev' in qt5 Change-Id: I619cf4f0168d08cb2e94b23db557d9a53f9e5338 Reviewed-by: Liang Qi --- qtwayland | 2 +- qtwebglplugin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtwayland b/qtwayland index 80001cbf..c8745157 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 80001cbf0451f4ba2a971fb20b80dc8e25ac604d +Subproject commit c87451570f93fd7bf8653c27d6120f6436b9aaae diff --git a/qtwebglplugin b/qtwebglplugin index bd97e6e5..bf68a46b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bd97e6e554c21144cadc9e047fa7d5f22f5f32bc +Subproject commit bf68a46bef7cf667a8ac361c2f9f7b27e2587578 -- cgit v1.2.3 From c09135cb56e03dd6a09b79f2c6e15932e9433df2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Jan 2019 15:24:27 +0200 Subject: Provisioning: Update Android NDK to version r19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/windows/android.ps1 | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..97df7e57 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,14 +51,14 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" +ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -- cgit v1.2.3 From f678ae3769e69ffc3afbd2f45ef60c92e4db5f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 09:46:17 +0200 Subject: Fix soft links and file modes of a few macOS provisioning scripts Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../01-sha1sum-compatibility.sh | 42 +++++++++++++++++++++- .../qtci-macos-10.12-x86_64/02-disable-ntp.sh | 0 .../01-sha1sum-compatibility.sh | 19 +++------- .../qtci-macos-10.13-x86_64/35-install-breakpad.sh | 0 4 files changed, 46 insertions(+), 15 deletions(-) mode change 120000 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh deleted file mode 120000 index 58a40af4..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh +++ /dev/null @@ -1 +0,0 @@ -../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh new file mode 100755 index 00000000..52650fea --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh index c3936499..52650fea 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh @@ -33,18 +33,9 @@ ## ############################################################################# -# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'. -# In order to make all unix provioning scripts run on macOS without special case handling -# a symbolic link is created. -# The shasum tool is a perl script which does some globbing to determine the perl version. The -# symbolic link has to point directly to the binary including the perl version. -# Additionally the CI seems to have multiple parallel perl versions installed which causes -# multiple shasum tools to be present (shasum5.16, shasum5.18). -# -# Currently this is -# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18 +#!/usr/bin/env bash + +set -ex -[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin -# shellcheck disable=SC2012 -SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1) -sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From b2afcc84055a7d1fe8c8ede56961d52e19782a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 13:01:21 +0200 Subject: Fix shellcheck complaints from provisioning scripts Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 5 +++-- .../qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh | 0 .../qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 4 +++- .../04-yocto_ssh_configurations.sh | 1 + .../10-openssl_for_android_linux.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 3 ++- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh | 4 +++- .../qtci-macos-10.12-x86_64/06-disable_spotlight.sh | 5 ++++- coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh | 4 +++- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh | 4 +++- coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh | 3 ++- .../qtci-macos-10.13-x86_64/06-disable_spotlight.sh | 5 ++++- coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh | 4 +++- .../qtci-macos-10.13-x86_64/21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 5 ----- coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh | 4 +++- 60 files changed, 93 insertions(+), 50 deletions(-) mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index addfb673..e86870c0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -124,7 +124,8 @@ sudo pip install virtualenv wheel sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory -/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 938ef37c..b917d292 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -37,6 +37,7 @@ set -ex +# shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 4559151e..f2eb6e60 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -45,7 +45,7 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) -for i in `seq 10`; do +for i in $(seq 10); do echo attempting to remove aptdaemon sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true # check that aptdaemon is no longer installed @@ -178,7 +178,8 @@ echo "Installing packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh index ca31a876..89806892 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh index c2331d16..96b197ea 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh @@ -33,4 +33,7 @@ ## ############################################################################# +set -ex + +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh index ca24a70e..d8df4375 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/fbx_linux.sh +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh index 6784335a..0527fe85 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/android_linux.sh source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh index 8f81a7dd..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/cmake_linux.sh +"$BASEDIR/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh index 37aec494..4034162e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index c4740556..a2d162d3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_700.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh index 4a6681f3..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/docker.sh +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh index 27ff15c3..e4281588 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 1d567a3e..dae1a58e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,7 +168,7 @@ waitLoop sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index e3faa20e..4ca84072 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -34,6 +34,7 @@ set -ex +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # build latest qemu to usermode diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index fbe669d9..1c856c0c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -37,7 +37,9 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." @@ -76,7 +78,7 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh index e4d988fc..a6aa3b10 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh index 0f89e72c..81ea3b17 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/openssl_for_android_linux.sh source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh index 4527e984..7c58c478 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -33,4 +33,7 @@ ## ############################################################################# +set -ex + +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh index 1a185223..4dd1d40e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh index 24ac2ac0..1d7a3968 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_700.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh index 4a6681f3..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/docker.sh +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh index 43790efd..fcc7d31c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -1,3 +1,4 @@ #!/bin/bash +# shellcheck source=../common/linux/squish-coco.sh source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh index b062800a..c8f3ac03 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/ubuntu-version.sh +"$BASEDIR/../common/linux/ubuntu-version.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 208762d3..6c5d2a0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh index ecce5ae7..09a76778 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/emsdk.sh source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh index 32528873..3304cc3e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex -$(dirname $0)/../common/unix/disable-ntp_macos.sh +# shellcheck source=../common/unix/disable-ntp_macos.sh +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh index d991e6c0..67e2c1f6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash -$(dirname "$0")/../common/macos/disable_spotlight.sh +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index 6d3a2bb5..6e47f6a5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -39,7 +39,7 @@ set -ex -# shellcheck source=../common/macos/InstallPKGFromURL +# shellcheck source=../common/macos/InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 8877c40b..dcfcb93b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index f7aba0dc..1fa8b05d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="9.2" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh index e5dd1910..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh index 0ead5a58..06e984ec 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh index ef65edad..7ebb8825 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python2.sh source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh index 92b05bf3..eb2a4863 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python3.sh source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh index 469901b5..2aedfe7b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/libiodbc.sh +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh index a35d26ca..eaabce82 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/virtualenv.sh +"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index d68bf90a..33795b08 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package -$BASEDIR/../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh index 9ce5d9ff..34eefeb6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/fbx_macos.sh +"$BASEDIR/../common/macos/fbx_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 36bcf53c..963f48d6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -2,4 +2,5 @@ set -ex +# shellcheck source=../common/macos/install_openssl.sh source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index e1a41835..5bc77ad3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt") +loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt") loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." @@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") +DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") echo "Unlocking $devIDKeychain with password.." security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain @@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios -iosPassword=$(<"$targetFolder/ios_password.txt") +iosPassword=$(cat "$targetFolder/ios_password.txt") iPhoneDeveloper="iosdevelopment.p12" shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign iPhoneDistribution="iosdistribution.p12" shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh index 27ff15c3..17a0c38e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh index 32528873..64d43d83 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash -$(dirname $0)/../common/unix/disable-ntp_macos.sh +# shellcheck source=../common/unix/disable-ntp_macos.sh +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh index d991e6c0..67e2c1f6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash -$(dirname "$0")/../common/macos/disable_spotlight.sh +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh index 06437ee1..9a667c64 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh @@ -39,7 +39,7 @@ set -ex -# shellcheck source=../common/macos/InstallPKGFromURL +# shellcheck source=../common/macos/InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh index 8877c40b..dcfcb93b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh index f7c251b1..d4708031 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="10.1" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh index e5dd1910..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh index 0ead5a58..06e984ec 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh index 69c6b318..86db3e27 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/pip.sh +"$BASEDIR/../common/macos/pip.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh index ef65edad..7ebb8825 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python2.sh source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh index 92b05bf3..eb2a4863 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python3.sh source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh index 469901b5..2aedfe7b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/libiodbc.sh +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh index a35d26ca..eaabce82 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/virtualenv.sh +"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh index fea11e01..aad628cb 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..c0d75ff6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" -toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" - -toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -ndkTargetFile="/tmp/$ndkFile" ndkSourceFile="$basePath/$ndkFile" echo "Unzipping Android NDK to '$targetFolder'" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh index 9ce5d9ff..34eefeb6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/fbx_macos.sh +"$BASEDIR/../common/macos/fbx_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 36bcf53c..963f48d6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -2,4 +2,5 @@ set -ex +# shellcheck source=../common/macos/install_openssl.sh source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index d9caff91..0b8595a0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null +{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." @@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null +{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null echo "Unlocking $devIDKeychain with password.." { security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null @@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null +{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null iPhoneDeveloper="iosdevelopment_2019.p12" shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null +{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null iPhoneDistribution="iosdistribution_2019.p12" shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null +{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh index 27ff15c3..17a0c38e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" -- cgit v1.2.3 From 8630f18d1e2f072338da3d6196f90de690be95b3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 5 Apr 2019 07:03:27 +0200 Subject: Only update qtwebengine in this round Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 3fc22037..320c7316 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3fc220377455cb15a7e65cfc63707df552650887 +Subproject commit 320c7316b75be22112cb4802187c3873c9934eab -- cgit v1.2.3 From c654e63c87d83577116431e165115e0c6ceb723d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 7 Sep 2018 09:17:02 +0300 Subject: Update Windows 10, MSVC 2015 and MSVC 2017 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 updated to build 1809 msvc2015 update 3 14.0.25431.01 msvc2015 update 3 (KB3165756) msvc2017 5.18.2 4.7.03056 ms-zune is no longer available in the latest Windows 10 version dotnet and msvc 2015 update patch installation moved to pre-provisioning. Msvc 2015 update patch installation seems to be flaky with this windows version. Task-number: QTBUG-68190 Task-number: QTQAINFRA-2255 Task-number: QTBUG-71125 Change-Id: I87defffa488cb75f7de0909020073b35476bea80 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 12 ++-- coin/platform_configs/qt3d-runtime.txt | 23 +++++++- coin/platform_configs/qt5.txt | 24 ++++---- coin/platform_configs/qtbase.txt | 3 +- coin/platform_configs/qtconnectivity.txt | 2 +- coin/platform_configs/qtwebkit.txt | 2 +- .../06-msvc_2017_build_tools.ps1 | 2 +- .../qtci-windows-10-x86/msvc2015_update.ps1 | 2 +- .../qtci-windows-10-x86/msvc2017.ps1 | 2 +- .../01-enable-dotnet-framework.ps1 | 22 +++++++ .../06-msvc_2017_build_tools.ps1 | 48 ---------------- .../qtci-windows-10-x86_64/msvc2015_update.ps1 | 39 ++++++------- .../qtci-windows-10-x86_64/msvc2017.ps1 | 64 ++++++++++++++++----- .../msvc_2015_update3_patch.ps1 | 67 ++++++++++++++++++++++ .../common/windows/msvc_2015_update3_patch.ps1 | 67 ---------------------- .../01-enable-dotnet-framework.ps1 | 22 ------- .../qtci-windows-10-x86_64/01-remove-ms-zune.ps1 | 2 - .../qtci-windows-10-x86_64/05-msvc.ps1 | 4 +- .../10-msvc_2015_update3_patch.ps1 | 34 ----------- 19 files changed, 204 insertions(+), 237 deletions(-) mode change 120000 => 100644 coin/platform_configs/qt3d-runtime.txt create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 delete mode 100644 coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 14f89e80..54aa1156 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,12 +1,12 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle +qtci-windows-10-x86_64-14 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 120000 index 9b3b4cd8..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1 +0,0 @@ -qt5.txt \ No newline at end of file diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 100644 index 00000000..0072dfe3 --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1,22 @@ +Template Target OS Target arch Compiler Target Compiler Features +--------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3de18a74..0072dfe3 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,22 +1,22 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index edaf168f..e8e10354 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -2,6 +2,5 @@ Template Target OS Target arch Compiler Fe --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 4ac73c86..15f11bd1 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index a357ad5b..27782f88 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 index 0c00ba71..2bb92c22 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 index 2ad479c8..35f8dc3f 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index cf00ee88..052ec9c6 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 new file mode 100644 index 00000000..e7f4c248 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 @@ -0,0 +1,22 @@ +# The DirectX SDK installer requires .Net framework 3.5 which isn't installed +# by default + +$netFeature = "NetFx3" +try { + $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State + if ($netFeatureState -eq "Enabled") { + Write-Host ".Net Framework is already installed" + exit 0 + } +} catch { + Write-Host "Could not find .Net Framework Windows feature." + exit 1 +} + +Write-Host "Installing .Net Framework client" +try { + Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart +} catch { + Write-Host "Could not install .Net framework" + exit 1 +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 deleted file mode 100644 index 0c00ba71..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 Build Tools -# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 - -$version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" -$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" -$msvcPackage = "C:\Windows\Temp\$version.exe" - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --passive --wait" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio Build Tools = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 2ad479c8..00f8af72 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,29 +30,22 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" -# Install Visual Studio $version with $update_version -# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs -$version = "2015" -$update_version = "3" +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25431.01" +$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978" -# Only way to install specific Visual studio release is to use feed.xml. -# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' -# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) -$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" +# default plus following components were selected: +# * Visual C++ +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 -$msvc_web_installer = "vs" + $version + "_" + $update_version -$package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" -$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" -$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" -echo "Fetching Visual Studio $version update $update_version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing Visual studio $version update $update_version..." -cmd /c "$package $parameters /norestart /Quiet" -remove-item $package - -echo "Visual Studio = $version update $update_version" >> ~\versions.txt +echo "Visual Studio = $version version $version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index cf00ee88..cc0dbd85 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,19 +31,57 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 +# Visual Studio $version version $version_number was installed manually using $installer. $version = "2017" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" -$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" -$msvcPackage = "C:\Windows\Temp\$version.exe" +$version_number = "15.8.5" +$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" +# Following components were selected from installer: +# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack) +# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK) +# Microsoft.Component.NetFX.Native (.NET Native) +# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack) +# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server) +# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references) +# Microsoft.Component.ClickOnce (ClickOnce Publishing) +# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools) +# Microsoft.VisualStudio.Component.NuGet (NuGet package manager) +# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools) +# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation) +# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers) +# Microsoft.Component.MSBuild (MSBuild) +# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools) +# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update) +# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM) +# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64) +# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake) +# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools) +# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools) +# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics) +# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger) +# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic) +# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support) +# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services) +# Component.Linux.CMake (Visual C++ tools for CMake and Linux) +# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features) +# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX) +# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors) +# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK) +# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK) +# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK) +# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64) +# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64]) +# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0)) -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio = $version" >> ~\versions.txt +echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..bfbb397a --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 @@ -0,0 +1,67 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# Install Cumulative Servicing Release Visual Studio 2015 update 3 +# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx + +$version = "2015 update3 (KB3165756)" +$packagePath = "C:\Windows\Temp" +$package = $packagePath + "\vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" +$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" +$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" +$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" + +if (Test-Path $preparedPackage) { + # The prepared package contains updated packages so that not everything has to be downloaded + Write-Host "Using prepared package" + Copy-Item -Recurse $preparedPackage $packagePath + # Remove the whole downloaded folder + $toRemove = $packagePath + "\vs14-kb3165756-update" + $executable = "$toRemove\vs14-kb3165756.exe" +} else { + Write-Host "Fetching patch for Visual Studio $version..." + Download $url_official $url_cache $package + $executable = $package + # Remove the downloaded executable + $toRemove = $executable +} + +Verify-Checksum $executable $sha1 +Write-Host "Installing patch for Visual Studio $version..." +Run-Executable $executable "/norestart /passive" + +Remove-Item -Force -Recurse -Path $toRemove + +Write-Output "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 deleted file mode 100644 index bfbb397a..00000000 --- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\helpers.ps1" - -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx - -$version = "2015 update3 (KB3165756)" -$packagePath = "C:\Windows\Temp" -$package = $packagePath + "\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" -$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" - -if (Test-Path $preparedPackage) { - # The prepared package contains updated packages so that not everything has to be downloaded - Write-Host "Using prepared package" - Copy-Item -Recurse $preparedPackage $packagePath - # Remove the whole downloaded folder - $toRemove = $packagePath + "\vs14-kb3165756-update" - $executable = "$toRemove\vs14-kb3165756.exe" -} else { - Write-Host "Fetching patch for Visual Studio $version..." - Download $url_official $url_cache $package - $executable = $package - # Remove the downloaded executable - $toRemove = $executable -} - -Verify-Checksum $executable $sha1 -Write-Host "Installing patch for Visual Studio $version..." -Run-Executable $executable "/norestart /passive" - -Remove-Item -Force -Recurse -Path $toRemove - -Write-Output "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 deleted file mode 100644 index e7f4c248..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# The DirectX SDK installer requires .Net framework 3.5 which isn't installed -# by default - -$netFeature = "NetFx3" -try { - $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State - if ($netFeatureState -eq "Enabled") { - Write-Host ".Net Framework is already installed" - exit 0 - } -} catch { - Write-Host "Could not find .Net Framework Windows feature." - exit 1 -} - -Write-Host "Installing .Net Framework client" -try { - Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart -} catch { - Write-Host "Could not install .Net framework" - exit 1 -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 deleted file mode 100644 index 6a398725..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe -Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index d019fc92..72ac1ca7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt # MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt # MSVC 2017 Build Tools Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - -- cgit v1.2.3 From 16201ab31d283b08dcf801a8f6068f402cd489f5 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 19 Mar 2019 09:48:01 +0100 Subject: Deprecate QtXmlPattern module Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304 Reviewed-by: Lars Knoll --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index acfa2616..2f6addc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,7 +49,7 @@ path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.13 - status = addon + status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations -- cgit v1.2.3 From 338fce191ac1e14b9365068021b4f7ec7ad50646 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 5 Apr 2019 10:12:36 +0200 Subject: Provisioning: Install i686 mingw on Windows 10 X64 Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-mingw.ps1 | 5 +++-- .../qtci-windows-10-x86_64/09-install-mingw730.ps1 | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 8b7fe41d..bc05ba91 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -37,7 +37,8 @@ function InstallMinGW { Param ( [string] $release = $(BadParam("release file name")), - [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + [string] $sha1 = $(BadParam("SHA1 checksum of the file")), + [string] $suffix = "" ) $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') @@ -45,7 +46,7 @@ function InstallMinGW if ($arch -eq "i686") { $win_arch = "Win32" } elseif ($arch -eq "x86_64") { $win_arch = "Win64" } - $envvar = "MINGW$version" + $envvar = "MINGW$version$suffix" $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 new file mode 100644 index 00000000..5401b36a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 7.3.0 + +$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0" +$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + -- cgit v1.2.3 From 261cc1bd8ffcb14fffaf4d8ecc77e4c50c5dae17 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Apr 2019 17:22:29 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index e84d8d2a..985a6192 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 +Subproject commit 985a61921fbcb893b89b8dde6eeaab5cf8c5dc1c diff --git a/qtbase b/qtbase index 958fa043..01a26959 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 958fa04327f4f3c29eb0e16cc448ef20c62e11a3 +Subproject commit 01a269593d281ae1cacc9cef5c5ccae10d41f03e diff --git a/qtconnectivity b/qtconnectivity index d21da782..6257ca58 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 +Subproject commit 6257ca589f435ea9b4f73067098ab54bbc873faf diff --git a/qtdeclarative b/qtdeclarative index aa51b3bf..651177db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aa51b3bf4ea854ffe7b39403289689daa428b221 +Subproject commit 651177db69a61278da5bc1b2434b8e7f291d5636 diff --git a/qtdoc b/qtdoc index adaefd7c..7f427f73 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit adaefd7cb8ed0849cd0a36a95912e37b3b14d35a +Subproject commit 7f427f737798d1454ba92277f38a2783ce1b2cd0 diff --git a/qtimageformats b/qtimageformats index 434aa248..b1d12f8c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 +Subproject commit b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 diff --git a/qtmultimedia b/qtmultimedia index f4181938..3f8b0a91 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f41819387531a5ddfbad2e80ceec7b57a5ebb7c6 +Subproject commit 3f8b0a916e9e0ca4e17900e1399ee8ad6bbf35b8 diff --git a/qtqa b/qtqa index dc4cbd9f..f6ae7d57 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 +Subproject commit f6ae7d57052527d358f839e60847a2a2e28df038 diff --git a/qtquickcontrols b/qtquickcontrols index c901f6d2..1edf84ef 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c901f6d2ee7f73f58881424b05d57360720fa7d9 +Subproject commit 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d0f6b286..f5f36b0d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d0f6b28618f7252f3f7c915a6a91a153f350e354 +Subproject commit f5f36b0db64e77822ef3053245c993ed14949192 diff --git a/qttools b/qttools index 50335cb2..844d7582 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 50335cb26bb88930f5e2a204642439cc9a4d2282 +Subproject commit 844d7582dc73ec0ec11f939cc1cf9e4abb4786e8 diff --git a/qtwayland b/qtwayland index 7a0956a8..5405de12 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7a0956a89a559e5a73a659fcc08001cefa01d9bd +Subproject commit 5405de120bba480f780e37e90fbd7c2ff1308b01 diff --git a/qtwebengine b/qtwebengine index 1110b9b5..2b623019 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1110b9b50e61bf2663e2037ce9e28e74a8943919 +Subproject commit 2b623019de45daba51ae31d16e4b05e3c30adbc3 -- cgit v1.2.3 From b3e35cbac501c749cd17a48c8fc85ef6f8acbba7 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Apr 2019 09:13:26 +0300 Subject: Provisioning: Remove MSVC 2015 update 3 patch from provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi --- .../10-msvc_2015_update3_patch.ps1 | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - -- cgit v1.2.3 From 6db224cfc70c2b9b45a39c3e340cd327cc1b8723 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Apr 2019 20:24:06 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 985a6192..00992700 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 985a61921fbcb893b89b8dde6eeaab5cf8c5dc1c +Subproject commit 0099270008fa1d218fb5ed38028e6e27ca811bb1 diff --git a/qtbase b/qtbase index 01a26959..6d4a456a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 01a269593d281ae1cacc9cef5c5ccae10d41f03e +Subproject commit 6d4a456a28282973d2501e0b16f09cafb316bb0a diff --git a/qtdeclarative b/qtdeclarative index 651177db..936cc8ad 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 651177db69a61278da5bc1b2434b8e7f291d5636 +Subproject commit 936cc8adccecfdd32966bd9c1ff7a9f534a027fe diff --git a/qtmultimedia b/qtmultimedia index 3f8b0a91..c785e8fc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3f8b0a916e9e0ca4e17900e1399ee8ad6bbf35b8 +Subproject commit c785e8fcfd0202a88a5e28f8a1410a83f95a9c9f diff --git a/qtqa b/qtqa index f6ae7d57..8c9be4c8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f6ae7d57052527d358f839e60847a2a2e28df038 +Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 diff --git a/qtwebengine b/qtwebengine index 2b623019..44303861 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2b623019de45daba51ae31d16e4b05e3c30adbc3 +Subproject commit 44303861fd116b3a279d26300147e89a0bf8121c -- cgit v1.2.3 From 791ec923a799a7cdba0b926412aa9fedb4bdc983 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 26 Feb 2019 13:12:02 +0200 Subject: Provisioning: Echo Emscripten version information to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4 Reviewed-by: Juha Karjalainen Reviewed-by: Morten Johan Sørvig Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/emsdk.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 284eb19d..55f5a8c9 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -76,3 +76,6 @@ EOM SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" + +echo "Emsdk = $version" >> ~/versions.txt +echo "Emsdk node = $version_node" >> ~/versions.txt -- cgit v1.2.3 From 314db90904d673125d1ddbbd927a1577855809c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Apr 2019 04:20:30 +0000 Subject: Update submodules on '5.13' in qt5 Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qt3d b/qt3d index 6f7ac292..276be935 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6f7ac29268df048b5f23ad26c47efcbfdfdb3585 +Subproject commit 276be935bfeccde733bacd4267abeb978f6efda5 diff --git a/qtbase b/qtbase index a0446b13..eaf20420 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0446b13982b8cd1c7d75df71c800c9343e8ab1e +Subproject commit eaf20420f8a4d72c804a9d3725c3e294b34c78c8 diff --git a/qtcharts b/qtcharts index 2286b0d6..be2280a9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2286b0d68cad71bd1c266070377c86ad961bf1ba +Subproject commit be2280a9600430d55595742ec75c08bb1556ec9b diff --git a/qtconnectivity b/qtconnectivity index 845e185b..d1d8feec 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 845e185b2881210b8f3a0dc25926c3d74b0008bf +Subproject commit d1d8feec751abdf872c4f13e0253202f87c19d1a diff --git a/qtdeclarative b/qtdeclarative index 4407f1f8..8c3172d7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4407f1f81813216bf64021eab7dcecc88d3056fe +Subproject commit 8c3172d724f3ad03cdee7bae23443fa109d350b1 diff --git a/qtdoc b/qtdoc index 72682347..2d021dd9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7268234726f41dec0615abfe651e882eef0cda48 +Subproject commit 2d021dd91a018f18faf56647319510afb8f7e292 diff --git a/qtimageformats b/qtimageformats index 9293902f..86872a18 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9293902f325341f0c188bdf4f662c3a7d949a343 +Subproject commit 86872a1846ce622bb5f305a75a20939ac145122f diff --git a/qtlocation b/qtlocation index 5389a65d..01dca9ef 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5389a65dc7434c4ed269a5d0c5cb93f5b12823ba +Subproject commit 01dca9ef9887109be8dfc550f8fa881e208535bf diff --git a/qtmultimedia b/qtmultimedia index b07a7d79..f787689e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b07a7d79f3080892d381c40ec79679450bda5431 +Subproject commit f787689e74dee63c55f2731683a4ede752fd9e44 diff --git a/qtqa b/qtqa index dc4cbd9f..8c9be4c8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 +Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 diff --git a/qtquickcontrols b/qtquickcontrols index 4bfe4b89..3d444423 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4bfe4b892cbbe1f1936d7caa0aac603258abc5df +Subproject commit 3d44442331ba6f1ba7a5d5ad9f3834993911e288 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d9b0e2cd..90018127 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 +Subproject commit 9001812730bccd4ee5153ad47aa130b230c27d78 diff --git a/qtremoteobjects b/qtremoteobjects index 09029d0c..cb9a20c5 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 09029d0c14c2101c98e038f46223595c5333f4cc +Subproject commit cb9a20c50584eaf950c1fc9a7fd7961a92100046 diff --git a/qtscript b/qtscript index fdac5687..8d2c11ac 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit fdac568771dd146dac26cea47c83c8e2b9a1a240 +Subproject commit 8d2c11ac2352556167dc4a86172cd9bc3a979ed8 diff --git a/qtserialbus b/qtserialbus index 20f68cef..3df07ae0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 20f68cefe6d9a4c073721855053076cb63980a83 +Subproject commit 3df07ae0b98dabbc2b60bab162173b24b010a4ee diff --git a/qtspeech b/qtspeech index d6d6bae3..c79b11cb 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d6d6bae390b90ff341d08e7d4d51c4f7ccd972c2 +Subproject commit c79b11cbf4eb6e72d32eb98a262201341018b620 diff --git a/qttools b/qttools index dea5f552..66743ae9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dea5f5524414e743e098151382e4d00a5b924bd1 +Subproject commit 66743ae97387da43dc6f27e5237ec472edae35f5 diff --git a/qtwayland b/qtwayland index 59fcde2e..0b10284a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 59fcde2e722ea6f7342ac9bf956f5f0b2911e7fd +Subproject commit 0b10284a3589b37a9d639f3d1af4b1d641fbb6ab diff --git a/qtwebchannel b/qtwebchannel index 6e3fb84e..f5f5eea1 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6e3fb84e6caa8c9bd4952bd647466469c5faf526 +Subproject commit f5f5eea1e204642c25360106825a92a9336584b4 diff --git a/qtwebengine b/qtwebengine index 320c7316..64a2e6ff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 320c7316b75be22112cb4802187c3873c9934eab +Subproject commit 64a2e6ff1cb9c169f251ee5983c27156b27a0470 diff --git a/qtwebglplugin b/qtwebglplugin index 26e75b0e..c21dbf12 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 26e75b0e33d4480c891b669c34907ce3c0e7b5df +Subproject commit c21dbf122e57ee90436de65a7f868fd8ce5a377b -- cgit v1.2.3 From 403d4e1d969d4ad079935061e7b6937352b474ed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Apr 2019 22:31:05 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I1e38740b9e4f4c9570d02d5b131def095418778f Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index eaf20420..63e88f60 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eaf20420f8a4d72c804a9d3725c3e294b34c78c8 +Subproject commit 63e88f60a769f2535945db0e1cabb9815ff45a77 diff --git a/qtconnectivity b/qtconnectivity index d1d8feec..1fdbe1c6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d1d8feec751abdf872c4f13e0253202f87c19d1a +Subproject commit 1fdbe1c6a9b818b5928537f176fcf026b31e17a2 diff --git a/qtdeclarative b/qtdeclarative index 8c3172d7..75998b22 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8c3172d724f3ad03cdee7bae23443fa109d350b1 +Subproject commit 75998b22b0b216d925e93d2c0e205025c23b2522 diff --git a/qtdoc b/qtdoc index 2d021dd9..256e0b4a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2d021dd91a018f18faf56647319510afb8f7e292 +Subproject commit 256e0b4ab4181cc0eb3a8ddde4d464b98e6be16a diff --git a/qtlocation b/qtlocation index 01dca9ef..394f7a1d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 01dca9ef9887109be8dfc550f8fa881e208535bf +Subproject commit 394f7a1dc772d2dfa1a65b456e623b7d09d0d482 diff --git a/qtmultimedia b/qtmultimedia index f787689e..82fdc891 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f787689e74dee63c55f2731683a4ede752fd9e44 +Subproject commit 82fdc8913483dd352ae2c326dd358fe9ff8f3f66 diff --git a/qtwebengine b/qtwebengine index 64a2e6ff..43eb77cb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 64a2e6ff1cb9c169f251ee5983c27156b27a0470 +Subproject commit 43eb77cb0d93020ce7db27fa2ac8dc7ef7738709 -- cgit v1.2.3 From d2697103835ef7a951d847ada13ccd522f5f9df8 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 3 Apr 2019 14:47:29 +0300 Subject: Change linux webasembly build from devoloper build to release build Change-Id: Ic2481d69b69e6bc50d583adf5e1d2857abc6ec25 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 54aa1156..29a20a07 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,7 +11,7 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch -- cgit v1.2.3 From 48443b4b9a8009b51728e020454e189d8c995acf Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Mon, 8 Apr 2019 12:54:40 +0300 Subject: Provisioning: update python 2.7.14 to 2.7.16 Python 2.7.14 used tlsv1 which is no longer accepted by github thus needing update to newer version. Task-number: QTQAINFRA-2900 Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/python2.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index f4016f8d..4ab914de 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" -SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg" +SHA1="895a8327a58e7c0e58852638ab3d84843643535b" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" @@ -55,5 +55,5 @@ InstallPip python2.7 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" -echo "python2 = 2.7.14" >> ~/versions.txt +echo "python2 = 2.7.16" >> ~/versions.txt -- cgit v1.2.3 From 21a6541aebfa90e78510460393636826391b54d7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Apr 2019 07:51:43 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebview | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 00992700..1fcdee0f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0099270008fa1d218fb5ed38028e6e27ca811bb1 +Subproject commit 1fcdee0f313845f4e06b294cf520ab477191774b diff --git a/qtbase b/qtbase index 6d4a456a..73698cb3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6d4a456a28282973d2501e0b16f09cafb316bb0a +Subproject commit 73698cb3401b9445ba0ad6b0a6cc3e125e50a745 diff --git a/qtconnectivity b/qtconnectivity index 6257ca58..8b643c80 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6257ca589f435ea9b4f73067098ab54bbc873faf +Subproject commit 8b643c80a81f4897e0a1ec6442820c60bbc802b1 diff --git a/qtdeclarative b/qtdeclarative index 936cc8ad..b2fd2b66 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 936cc8adccecfdd32966bd9c1ff7a9f534a027fe +Subproject commit b2fd2b664212344eb82b44f916c849314d5e02fb diff --git a/qtgamepad b/qtgamepad index cd571466..8ecbb722 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit cd571466dc25674b25f34a3e2476c6a0b53dd25f +Subproject commit 8ecbb7227b5bf2da6887e5a4ec0c7c7012affb6e diff --git a/qtmultimedia b/qtmultimedia index c785e8fc..c8716f68 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c785e8fcfd0202a88a5e28f8a1410a83f95a9c9f +Subproject commit c8716f68feb5a38473cbd54972b9a9f095e9e24d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f5f36b0d..bd126fde 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f5f36b0db64e77822ef3053245c993ed14949192 +Subproject commit bd126fdea95ed994fdd35d50e445b45af75657ab diff --git a/qttools b/qttools index 844d7582..210fbd5f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 844d7582dc73ec0ec11f939cc1cf9e4abb4786e8 +Subproject commit 210fbd5f252da88d3ae7f191d5b987d793646712 diff --git a/qtwebview b/qtwebview index 8df88a17..3c347ac6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e +Subproject commit 3c347ac61ef444a0246921a58a51ccec6bab7413 -- cgit v1.2.3 From bf868c7e7a16fb7dcad22bc7a0d4b20cd578c352 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Apr 2019 22:31:02 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893 Reviewed-by: Qt Submodule Update Bot --- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtmultimedia b/qtmultimedia index 82fdc891..d55edfc3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 82fdc8913483dd352ae2c326dd358fe9ff8f3f66 +Subproject commit d55edfc3cf6b65949835586b4b216cfd672c8380 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 90018127..0bf12eda 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9001812730bccd4ee5153ad47aa130b230c27d78 +Subproject commit 0bf12eda7c5863bf3b22306f501292a9c6f2aa16 diff --git a/qttools b/qttools index 66743ae9..d92b976f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 66743ae97387da43dc6f27e5237ec472edae35f5 +Subproject commit d92b976f7d092a31c67edc2c515ac2444cd2808d diff --git a/qtwebengine b/qtwebengine index 43eb77cb..d29125ea 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 43eb77cb0d93020ce7db27fa2ac8dc7ef7738709 +Subproject commit d29125ea49a6a7c86ea20a90a1f3fddb9b13d9f4 -- cgit v1.2.3 From f31970d5ac48cd2ae6601aca32738ea718edb265 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Apr 2019 08:18:53 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 73698cb3..7b4f9dbf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 73698cb3401b9445ba0ad6b0a6cc3e125e50a745 +Subproject commit 7b4f9dbf270b6e3369da5f5c0187876dfad69e70 diff --git a/qtdeclarative b/qtdeclarative index b2fd2b66..fe3e9110 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b2fd2b664212344eb82b44f916c849314d5e02fb +Subproject commit fe3e9110327f022daf676766ce04b8a0a147c7c9 diff --git a/qtlocation b/qtlocation index 5c3e3464..397a31b1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac +Subproject commit 397a31b187d537f81610007b7d0f6f69b306dfd4 diff --git a/qtsensors b/qtsensors index f5281044..2c9fc2c1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f528104474dd74e34ea6a01da096e7c31730c01a +Subproject commit 2c9fc2c1a197b84ba9ef3dc4e586a77a18c3dcc5 diff --git a/qtserialbus b/qtserialbus index d5b3a2b6..fc5e6011 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d5b3a2b6e6462f4ad46fce8f52539333b131dcad +Subproject commit fc5e6011c1af70bd47a77796a0d0ab0fcd186541 diff --git a/qtwayland b/qtwayland index 5405de12..0b512866 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5405de120bba480f780e37e90fbd7c2ff1308b01 +Subproject commit 0b51286635ca3f724df94dd4d5268c950505f6ec diff --git a/qtwebengine b/qtwebengine index 44303861..89e5a7b1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 44303861fd116b3a279d26300147e89a0bf8121c +Subproject commit 89e5a7b1d874dda5b118017bfc6f16eee6a8493b -- cgit v1.2.3 From 869c15629d8397bc725c61da423a4a038ef4d395 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Apr 2019 22:30:55 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a Reviewed-by: Qt Submodule Update Bot --- qtcharts | 2 +- qtconnectivity | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtcharts b/qtcharts index be2280a9..beda274e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit be2280a9600430d55595742ec75c08bb1556ec9b +Subproject commit beda274e7d8b5a6864b254a9e63b654f3c494139 diff --git a/qtconnectivity b/qtconnectivity index 1fdbe1c6..320a6b28 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1fdbe1c6a9b818b5928537f176fcf026b31e17a2 +Subproject commit 320a6b28499010b8eed6d507da5ebc23b56f5ccc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0bf12eda..131210b5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0bf12eda7c5863bf3b22306f501292a9c6f2aa16 +Subproject commit 131210b59133fcebe0ab3c7823777f2b859dc7cd diff --git a/qtscxml b/qtscxml index 6581f591..acddb067 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6581f5911eb1dec25fa4870aae8e70a58b6e8dfd +Subproject commit acddb0676cafdc83edd08aee87181bf5602d6387 diff --git a/qtsensors b/qtsensors index 27ad6151..c1b883f0 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 27ad61518b47d34733ca18a9ad3da72a691d453d +Subproject commit c1b883f076f3f2a9f1f73ea20ea4688a7056b4c1 diff --git a/qttranslations b/qttranslations index 8243693e..133f635a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8243693e684f8b5d28ed09ffd80a6322c6134f68 +Subproject commit 133f635a25ee58596fcb556b87e841257390758b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e117cfe3..67e497ff 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e117cfe3be46ccb82b0b3a9674d65ffb0f49e4df +Subproject commit 67e497ff407441515761b312599cb4ad6b61adad diff --git a/qtwayland b/qtwayland index 0b10284a..1b773df9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0b10284a3589b37a9d639f3d1af4b1d641fbb6ab +Subproject commit 1b773df93f5bccb6b616d2a228cb15cffe8e32d5 diff --git a/qtwebchannel b/qtwebchannel index f5f5eea1..24e0c897 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f5f5eea1e204642c25360106825a92a9336584b4 +Subproject commit 24e0c897fac375514396191db7b582505028c918 diff --git a/qtwebengine b/qtwebengine index d29125ea..bcf38ab5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d29125ea49a6a7c86ea20a90a1f3fddb9b13d9f4 +Subproject commit bcf38ab56ac6637ea557ea73e39f5cac319e8fbf diff --git a/qtwebsockets b/qtwebsockets index d451e0af..74c8ebe9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d451e0af881365ba7524ed93e1ef3f68154c784b +Subproject commit 74c8ebe9696c981311f19bdd6544634ab1b7cc7f -- cgit v1.2.3 From 085407eb93ab48f9650ac2eaaedc4230fd766e2f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Apr 2019 11:52:12 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e Reviewed-by: Liang Qi --- qtconnectivity | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qtwebview | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index 320a6b28..ae7bcf5f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 320a6b28499010b8eed6d507da5ebc23b56f5ccc +Subproject commit ae7bcf5f5c3f3a227ddfacbf1178f3e791199455 diff --git a/qtlocation b/qtlocation index 394f7a1d..b392921e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 394f7a1dc772d2dfa1a65b456e623b7d09d0d482 +Subproject commit b392921e33b4e8d425f1881afb95e6d34e53879c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 131210b5..ced7d5af 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 131210b59133fcebe0ab3c7823777f2b859dc7cd +Subproject commit ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7 diff --git a/qtsensors b/qtsensors index c1b883f0..d1a1b629 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c1b883f076f3f2a9f1f73ea20ea4688a7056b4c1 +Subproject commit d1a1b62914d592bf0bb382accff29abc610d3fab diff --git a/qtserialbus b/qtserialbus index 3df07ae0..fe80eef6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3df07ae0b98dabbc2b60bab162173b24b010a4ee +Subproject commit fe80eef6b3377c8727c5190d275808c343ee7c75 diff --git a/qtsvg b/qtsvg index f799d19d..2043a358 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f799d19d6df12e20fc133ef8466d310427cc68ca +Subproject commit 2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7 diff --git a/qtwebview b/qtwebview index f625019a..d8958299 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f625019aef6dd336ead142d61ed480469c8711ee +Subproject commit d895829904a1de3f8a63d5ab56e73106847fddcf -- cgit v1.2.3 From f2af07b8edafa15594eed67afb68dc2481721541 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Apr 2019 22:30:49 +0200 Subject: Update submodules on '5.13' in qt5 Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25 Reviewed-by: Qt Submodule Update Bot --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index bcf38ab5..5de67028 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bcf38ab56ac6637ea557ea73e39f5cac319e8fbf +Subproject commit 5de670283e3093fcdd2a91dcca30ffbe0b03d230 -- cgit v1.2.3 From 74eab55ea83a9919e0a3085015d2e522bd351ac1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 14 Apr 2019 18:28:33 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ibb626ef0429631b901bfb894935b12cad1af6a5c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtspeech | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index b9ac4faf..100175e9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b9ac4faf28cc27849a392019564209b319f90568 +Subproject commit 100175e92d6adb346169eda0392b9485ca41a905 diff --git a/qtbase b/qtbase index 300940a6..8f44aeb1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 300940a6c9eb0f74cefda7d76a5d19f56ec50253 +Subproject commit 8f44aeb10317664dd7cae92e628fb0814e432e17 diff --git a/qtcharts b/qtcharts index a9149e59..4618124a 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a9149e59b50f80381158158de35d8a8d63707747 +Subproject commit 4618124ada61c28eefc3ab89fd151c0f9fbbba71 diff --git a/qtconnectivity b/qtconnectivity index 78b16fd7..21bfb762 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 78b16fd70a799963db17c4581736c1dcf344d10b +Subproject commit 21bfb7620f3cdcaf3d2b7c0b8a2294e174c7053b diff --git a/qtdatavis3d b/qtdatavis3d index 8b639bba..afe8f78d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8b639bba537b8c916105f289583c2ef77ed444fe +Subproject commit afe8f78d360eab894e6e85ecd72c75d8f365e6bb diff --git a/qtdeclarative b/qtdeclarative index 5cd819d2..2ccd4c36 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5cd819d264a932eccbd9d155a81c3c07a2918433 +Subproject commit 2ccd4c3672e5db2c25ca0f8df439fe8f646aa942 diff --git a/qtdoc b/qtdoc index 330f3a52..0c3bd91b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 330f3a52f7aba61dcf8b187235a5c0a3bd35f71a +Subproject commit 0c3bd91bb653c6cfff24927c1074dcca1597e716 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index dffbc2b1..c6fe3e3b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit dffbc2b18883630e4d47281145428bcc999bc490 +Subproject commit c6fe3e3be58efa4002876ad2b5c811355d1b21f0 diff --git a/qtimageformats b/qtimageformats index adcac668..155410fd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit adcac6683d4bf24ce2c87523110bf58ca71da8ee +Subproject commit 155410fd6369ceafccb865a9d0fe2169c63a7368 diff --git a/qtlocation b/qtlocation index de390341..5c53cd23 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit de39034175f6187d3d29786f467d11e985bf0cac +Subproject commit 5c53cd23351a1850f170dcf2fdcab7545cac3ddc diff --git a/qtlottie b/qtlottie index c265782b..80151882 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit c265782b178eb6654706c1ecc89f100b6c6c8a39 +Subproject commit 80151882a9a806f5fdbb700fd6a0db1300d9d5e0 diff --git a/qtmultimedia b/qtmultimedia index f05ef30e..2755dcf6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f05ef30ec1eacea7582b268d77a5e8654af2fdd5 +Subproject commit 2755dcf670f8b40ec2f3ecce356b378db08da872 diff --git a/qtqa b/qtqa index ba041bc9..8c9be4c8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ba041bc942056d52804acd5011ae5fe7877be045 +Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 diff --git a/qtquickcontrols b/qtquickcontrols index da824463..bdff4deb 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit da824463ba84d64ee4918feb2cf0e83d835f4404 +Subproject commit bdff4debf5f3f8125e3b7876bb5c62bc4251727f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d8981425..d1fdbd12 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d8981425c33f3bae930f31fbb2cf804c7337f33a +Subproject commit d1fdbd128f6e95255c7d9fc20ef07f44677a649e diff --git a/qtremoteobjects b/qtremoteobjects index dc67e73f..6272bab4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit dc67e73ff326d0fcc12610f26b97ddf6ffa17bed +Subproject commit 6272bab4eb61f39cfe4ada059f528c8d00246732 diff --git a/qtscript b/qtscript index 06386a0c..fc997508 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 06386a0c7bfe08f40b4ad090c79bcc09031fb8c0 +Subproject commit fc99750865129c3abe9c827dd136ab717a7f4601 diff --git a/qtscxml b/qtscxml index 844fae55..96b43552 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 844fae552b5a15901d7e0d337b37fc57589fe2c3 +Subproject commit 96b435525b17f1e16be953e01cd1f573e4342c2f diff --git a/qtsensors b/qtsensors index 3606a1a8..9b309ffa 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3606a1a8de2583fd533fd5a3cd80dd79ebddea7b +Subproject commit 9b309ffa389f58f3a87bf132e123ae78aee808a3 diff --git a/qtspeech b/qtspeech index a448e945..6b3d03f5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit a448e94579ed5495b2bb2c3105b73ae5acb735de +Subproject commit 6b3d03f56f4f58121f21f9fe38f51ce45d0130a8 diff --git a/qttools b/qttools index 175e1bbe..2ba9cc9a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 175e1bbe8ba890ea4d6d0d3ee01d7688c0725cfc +Subproject commit 2ba9cc9aad6fbd950ac4aa090f6480a500679ea2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4caabe5c..039e3e85 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4caabe5ca5d0e89bdd27c5b489848cdcc331daff +Subproject commit 039e3e85f9c3b4cd4980fa944e321f7009b93fd0 diff --git a/qtwayland b/qtwayland index c8745157..838de08e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c87451570f93fd7bf8653c27d6120f6436b9aaae +Subproject commit 838de08ed24c947be9ea3c311afc1556e62be9fc diff --git a/qtwebchannel b/qtwebchannel index ead6315c..aa490ada 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ead6315cc9624322ed5bca8e34cf426d0fa9159b +Subproject commit aa490ada3793fc3528bdfefb90479c711cc0c325 diff --git a/qtwebengine b/qtwebengine index 1b780f07..aef55c40 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1b780f07367ad98f1d812479a659d736d65ef54a +Subproject commit aef55c4091f252231718369b382dd8f401f206e3 diff --git a/qtwebglplugin b/qtwebglplugin index bf68a46b..2f419ac8 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bf68a46bef7cf667a8ac361c2f9f7b27e2587578 +Subproject commit 2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3 diff --git a/qtwebsockets b/qtwebsockets index f7a10a2d..6dd15c9f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f7a10a2d25871b4209d4acb723a14422fd24b97e +Subproject commit 6dd15c9f1bfdc010e4cd4b8158435063a5a7d229 diff --git a/qtwinextras b/qtwinextras index 864807b5..65dbe51c 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 864807b583c0538456f9988a7305d552ba5fba70 +Subproject commit 65dbe51cf3d61e4629178569721b26649d649b82 diff --git a/qtxmlpatterns b/qtxmlpatterns index 781c88be..1a2dca88 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 781c88be5ff94f092f8f7df84a07147a43b217a2 +Subproject commit 1a2dca888989cd332053d4738e24cd81779cf008 -- cgit v1.2.3 From 577d01e9dfaa9e69608097c550bd1877b5a9b735 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Apr 2019 11:48:52 +0200 Subject: Provisioning: disable docker test servers on Windows 10 (x86_64) This reverts commit 177df80f09f3a84af7d86390ae7160a64fad8b4c partially. Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/windows/docker.ps1 | 85 ---------------------- .../qtci-windows-10-x86_64/95-docker.ps1 | 6 -- 2 files changed, 91 deletions(-) delete mode 100644 coin/provisioning/common/windows/docker.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 deleted file mode 100644 index 6f53eccd..00000000 --- a/coin/provisioning/common/windows/docker.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################# -## -## 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 installs Docker tool kits and Apple Bonjour on Windows. - -function DownloadAndInstall -{ - Param ( - [string]$externalUrl, - [string]$internalUrl, - [string]$package, - [string]$sha1, - [string]$parameters - ) - - Write-Host "Fetching $package from URL..." - Download $externalUrl $internalUrl $package - Verify-Checksum $package $sha1 - - Write-Host "Installing $package..." - Run-Executable $package $parameters - - Write-Host "Remove $package..." - Remove-Item -Path $package -} - -# Install Docker Toolbox -$package = Get-DownloadLocation "DockerToolbox.exe" -$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" -$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" -Add-Path 'C:\Program Files\Docker Toolbox' -docker --version -docker-compose --version - -# Install Apple Bonjour -$package = Get-DownloadLocation "BonjourPSSetup.exe" -$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" -$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" -$sysInfoStr = systeminfo -if ($sysInfoStr -like "*A hypervisor has been detected*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V -} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX -} else { - Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 deleted file mode 100644 index df735855..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -# Disable Hyper-V from Windows 10 Pro/Enterprise -# Because VirtualBox is a type 2 hypervisor, it can't run if Hyper-V virtual machines are in use. -# Otherwise, docker-machine will complain about "VT-x is not available (VERR_VMX_NO_VMX)". -Disable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -NoRestart - -. "$PSScriptRoot\..\common\windows\docker.ps1" -- cgit v1.2.3