From f008144b88f18d82666898e9e80177a7e5682b44 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Thu, 16 Apr 2020 09:14:58 +0300 Subject: [PATCH 01/44] Adjust submodule branches --- .gitmodules | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9c017725..1b02e9ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.15 + branch = 5.15.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.15 + branch = 5.15.0 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.15 + branch = 5.15.0 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.15 + branch = 5.15.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.15 + branch = 5.15.0 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,98 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.15 + branch = 5.15.0 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 5.15 + branch = 5.15.0 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git - branch = 5.15 + branch = 5.15.0 status = addon From 767711b44a4c6cf6719db81753b7c800ad3da51d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Apr 2020 20:19:00 +0200 Subject: [PATCH 02/44] Update submodules on '5.15.0' in qt/qt5 Change-Id: Iba9ab3074ef49a9060ce594a0d30083891338e28 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 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 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 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 +- 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 0cd80d4f..153ad09e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0cd80d4f4e0390c7ba3aa2b2d36781403c1c2aae +Subproject commit 153ad09effc7388d331c478f0cfe697232a89705 diff --git a/qtactiveqt b/qtactiveqt index cdd58e2c..0aa2b1ac 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cdd58e2c155063f9b52b69a47f45c2430214e3a4 +Subproject commit 0aa2b1ac1d51d7af60a61d5c3a48fc6905cb1b1e diff --git a/qtandroidextras b/qtandroidextras index 645acc14..b67ed634 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 645acc14632f39b3adcc4312d7d1cf8ff915c8c3 +Subproject commit b67ed634117e645b33e200fe4d6b4137f6399df2 diff --git a/qtbase b/qtbase index 8138c812..94b02f6c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8138c812cbd65233a61d6e2e2f783d060c02de60 +Subproject commit 94b02f6cb20fcb597416a46f7e2defced39fb774 diff --git a/qtcharts b/qtcharts index c8e3bf29..785a8d71 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c8e3bf290551328851cf628ce4a488a06b013ac2 +Subproject commit 785a8d7118c4dd6117dd085bbe2da6e4bc717654 diff --git a/qtdatavis3d b/qtdatavis3d index 407bee91..d15ace03 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 407bee91eb83b6ff2df6e5d99366971bf21e2637 +Subproject commit d15ace0300d035283a7137e3a6e9a412ff53d019 diff --git a/qtdeclarative b/qtdeclarative index 94b46de4..796f6e1e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 94b46de4050d023ecbb238c2636d7e252f8f5949 +Subproject commit 796f6e1e8e99ea1046ffe2a744cfd1dca1248258 diff --git a/qtdoc b/qtdoc index 5cec5e99..dfd166b2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5cec5e99f391918c189d501e94523c3f1b5d3c73 +Subproject commit dfd166b29c80e73f5b67c1a1cd05ae197a6d0b97 diff --git a/qtgamepad b/qtgamepad index 19671371..b036b587 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 196713714a63e789b65822e2222208251857359b +Subproject commit b036b587216d89a0bf27f4e11ae4f453e8cce766 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 617bb58e..18f17fed 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 617bb58eb0b381ae6095fe8947bc7f9e25ef85b1 +Subproject commit 18f17fed89e1fd381ba9c3bf9a7b64d88cb62ad7 diff --git a/qtimageformats b/qtimageformats index 7625a06b..c7c320bf 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7625a06bd7bfcf77e896086d049b334f1b66c75d +Subproject commit c7c320bf134e6df6a98f10c357ff36e2c8008e53 diff --git a/qtlocation b/qtlocation index eda2a7c2..09da28bb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eda2a7c286058176e1906d0ddc88d4e2cfbec55e +Subproject commit 09da28bb9acd11359424ae7b81114c991ce9d4f7 diff --git a/qtmacextras b/qtmacextras index 9f58d3af..52e2485e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 9f58d3afbf3157bf9dcf3614a530fb8e179f60b9 +Subproject commit 52e2485ef1a10e6974f9603df414a4d649669240 diff --git a/qtmultimedia b/qtmultimedia index 457181d7..5e9db9c1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 457181d73c5bc188cfea13e13dbe930de3b993d3 +Subproject commit 5e9db9c117309e84adc5dba32f59a05760867558 diff --git a/qtnetworkauth b/qtnetworkauth index 72f5b40b..6ad275b1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 72f5b40b00178710b36edc7ed1769321182e7fa6 +Subproject commit 6ad275b1eb35c4e9d75e217adaad4f5101a3bb28 diff --git a/qtpurchasing b/qtpurchasing index 6ec39500..231e7e55 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00 +Subproject commit 231e7e55e9bb8a70bbb2c43ed3e92804ff5577b2 diff --git a/qtqa b/qtqa index 930a856e..ff87df77 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 930a856e0769483e9102bddff4acc2e079860f2a +Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 diff --git a/qtquick3d b/qtquick3d index 145bca6e..962950bf 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 145bca6ec8447cc2a6cf9b6afdee309d904e94ec +Subproject commit 962950bfb11458cfddb3b7271ea9516c2e498cdf diff --git a/qtquickcontrols b/qtquickcontrols index e9ad3352..f7b36543 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e9ad3352df0815761c1fde8ea36b040e8431f360 +Subproject commit f7b3654305a31fc5a4bbba2dbb3d13f6ba652b6a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 71757283..e2768b6d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 71757283972348971a79c905f9c8b1b42870d876 +Subproject commit e2768b6d054c62c21a343fe25557d3ff9e45d1d1 diff --git a/qtquicktimeline b/qtquicktimeline index 87d429e0..e40206c7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 87d429e0ada30197945a65a91fcaedd935a37ad0 +Subproject commit e40206c703c57f3c98263a7481597dfced5db6c1 diff --git a/qtremoteobjects b/qtremoteobjects index 9ec14db5..54ad6e29 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9ec14db5a9f735eb4286984f934568f089627bd7 +Subproject commit 54ad6e294d367a7e34e8a40022f6c520d7f6bb4a diff --git a/qtrepotools b/qtrepotools index d6e8ca40..8f06a503 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d6e8ca40f5331c1016d63fbb18309baafc08ba43 +Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 diff --git a/qtscript b/qtscript index 36300dd0..ebd4605c 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 36300dd06bb8191800ec93ca5a408f39b1f221eb +Subproject commit ebd4605c712941030edac8f5b7c32971e9541f7a diff --git a/qtscxml b/qtscxml index 85ef74c2..063f77e1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 85ef74c296716081b044db5fd9db4692443c229f +Subproject commit 063f77e160122da7ff720ca3971f9fd6d875982b diff --git a/qtsensors b/qtsensors index 3c7ddeee..d6d2de14 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837 +Subproject commit d6d2de144d1dadc41ded78a5eedb76d3d7ab5436 diff --git a/qtserialbus b/qtserialbus index 1274acb4..b12bc310 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1274acb4bf4cdd06781495f5d9f90adb7268c318 +Subproject commit b12bc31046b29d67a59ab6b28cbc61e03dea0712 diff --git a/qtserialport b/qtserialport index ff3fd7b0..48d52408 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ff3fd7b0330cb76772066ce7162320f4dc1a5c28 +Subproject commit 48d52408fcd640c2c5e6fcd537ff6b766849db14 diff --git a/qtspeech b/qtspeech index 1b67cc56..d9dbe04c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1b67cc563c3233df55c16ab9c23ba111233a365b +Subproject commit d9dbe04ce445b93c36ccfab4b5145d41cd4a58ff diff --git a/qtsvg b/qtsvg index 2c67415a..e12485f6 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2c67415afc2e12bab958e16b18bcab88a537c248 +Subproject commit e12485f69e12fc382174a8d081fcb88c3567a4d3 diff --git a/qttools b/qttools index 1b992406..95cd9078 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1b992406a6523a144c58baa9bbd1198bb9a2d98c +Subproject commit 95cd9078938bcd88fdfbba707911e8111f59f195 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b3556c25..4286d326 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b3556c25ffdc64595e41d005b091776035134846 +Subproject commit 4286d326885d629421c6d5511db8f9f619cc83f8 diff --git a/qtwayland b/qtwayland index 224f48fa..e72f7db3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 224f48fa0d5eb325f66769054ed3e8d0a24d862a +Subproject commit e72f7db39f58063267036a4e5d066e70a80184b2 diff --git a/qtwebchannel b/qtwebchannel index cbbb6c38..bb144ebc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit cbbb6c38fa9b64e9e4eb98af0bf687ef469aa327 +Subproject commit bb144ebca2ea2fda8f2ee75e233979e6df2d37c6 diff --git a/qtwebengine b/qtwebengine index 3125f1ac..3c9609c9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3125f1ac3951c63c20110c7e3946ca281cebbdf3 +Subproject commit 3c9609c9b469a9d4ea4bfac9f9886d8eb2f4d0f6 diff --git a/qtwebglplugin b/qtwebglplugin index ab0d58ef..f1327aa3 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ab0d58ef0a2cd21eab7dc612004e416d3d55a78e +Subproject commit f1327aa34c68b1536247c37925a3cbb255f6f27a diff --git a/qtwebsockets b/qtwebsockets index 37203fab..d937c580 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 37203fab746060edaccea8abcddc181611ab0555 +Subproject commit d937c580ec5ce24a4aad6cc9e4927cad5a93acda diff --git a/qtwebview b/qtwebview index d47cad5c..6e84d7a8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d47cad5ca5c3788fedc0a53930e47efb869f9315 +Subproject commit 6e84d7a8cddde19aa2c752e7dacf4bc8f78eefbb diff --git a/qtwinextras b/qtwinextras index d5310efd..41f8d34e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d5310efd2fbbe9786a4257f3ada78381cb54da23 +Subproject commit 41f8d34efdf0113e774914db8e63d9e880f8264d diff --git a/qtx11extras b/qtx11extras index 8136ffdf..306a2b20 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583 +Subproject commit 306a2b20a8792079faf6dae864161f1b5cc6646f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0964e5c3..af8b0cfd 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0964e5c37395d7d5f6c50d1e659d3bc8f2707711 +Subproject commit af8b0cfdc85d593eb63eb9fe4d61b61ba6382e9d From d88858d98bf346888cce1c218c6864e3ca4f95cb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 24 Apr 2020 22:39:11 +0200 Subject: [PATCH 03/44] Update submodules on '5.15.0' in qt/qt5 Change-Id: Id2db92b9b2928ea7452edb313cc673581bf12b35 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 153ad09e..36ef8534 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 153ad09effc7388d331c478f0cfe697232a89705 +Subproject commit 36ef85341aacd225839d58880d3f388f31e3100c diff --git a/qtbase b/qtbase index 94b02f6c..9e83d268 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 94b02f6cb20fcb597416a46f7e2defced39fb774 +Subproject commit 9e83d268d6e0bd492fafad823a47cef57b7916c5 diff --git a/qtdeclarative b/qtdeclarative index 796f6e1e..7b9b44d8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 796f6e1e8e99ea1046ffe2a744cfd1dca1248258 +Subproject commit 7b9b44d8f45c57df1393960807497bd7286d3471 diff --git a/qtdoc b/qtdoc index dfd166b2..7cbe7f97 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dfd166b29c80e73f5b67c1a1cd05ae197a6d0b97 +Subproject commit 7cbe7f97ad7585c72b18f786b83122840f7159cc diff --git a/qtlocation b/qtlocation index 09da28bb..145a28ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 09da28bb9acd11359424ae7b81114c991ce9d4f7 +Subproject commit 145a28ad34837bee8ba3d2acd9932d1b7825fd78 diff --git a/qtlottie b/qtlottie index f5cc3184..eeac3807 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f5cc3184f30c9fa1b81d931430aaa4f6f23267a3 +Subproject commit eeac38075b17ae74821e9976d3dd37346a4f822c diff --git a/qtmultimedia b/qtmultimedia index 5e9db9c1..3ce4b38a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5e9db9c117309e84adc5dba32f59a05760867558 +Subproject commit 3ce4b38a7c6711ea378a56baec84b73da55a9c84 diff --git a/qtquick3d b/qtquick3d index 962950bf..e3d353b6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 962950bfb11458cfddb3b7271ea9516c2e498cdf +Subproject commit e3d353b6235d658689d65c3e6a5dc25cee430590 diff --git a/qtquickcontrols b/qtquickcontrols index f7b36543..c9b02709 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f7b3654305a31fc5a4bbba2dbb3d13f6ba652b6a +Subproject commit c9b0270985a64c9682ddf304d18a18dfb18c8944 diff --git a/qtremoteobjects b/qtremoteobjects index 54ad6e29..f68928c4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 54ad6e294d367a7e34e8a40022f6c520d7f6bb4a +Subproject commit f68928c439fac00b27e85c9ae3f7e3ec0dca2221 diff --git a/qtscxml b/qtscxml index 063f77e1..e72ad1f0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 063f77e160122da7ff720ca3971f9fd6d875982b +Subproject commit e72ad1f088d054678b7d70133fe702d91ae6b366 diff --git a/qtsensors b/qtsensors index d6d2de14..b084dc36 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d6d2de144d1dadc41ded78a5eedb76d3d7ab5436 +Subproject commit b084dc36e39d74e1e1039ecfac345c9b54964f40 diff --git a/qtserialport b/qtserialport index 48d52408..1c736fef 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 48d52408fcd640c2c5e6fcd537ff6b766849db14 +Subproject commit 1c736fefa6dd8868610ff9ae59cd7552f1c7a891 diff --git a/qttools b/qttools index 95cd9078..e967772f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 95cd9078938bcd88fdfbba707911e8111f59f195 +Subproject commit e967772fe884dd8a488a359c122c9cbae9d94c55 diff --git a/qttranslations b/qttranslations index 95ece410..b0be8ca6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 95ece41082b43ec1b85e33074229941f4db71bb7 +Subproject commit b0be8ca652f732439e562f75be372730e2452042 diff --git a/qtwayland b/qtwayland index e72f7db3..4bd13402 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e72f7db39f58063267036a4e5d066e70a80184b2 +Subproject commit 4bd13402f0293e85b8dfdf92254e250ac28094c7 diff --git a/qtwebengine b/qtwebengine index 3c9609c9..38cbd955 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3c9609c9b469a9d4ea4bfac9f9886d8eb2f4d0f6 +Subproject commit 38cbd955daeaa66201f17a6928a11972950ef154 diff --git a/qtwebview b/qtwebview index 6e84d7a8..d2e2dbea 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 6e84d7a8cddde19aa2c752e7dacf4bc8f78eefbb +Subproject commit d2e2dbeaf681a5a1b79808e1ed982ae6e4563ae4 From d9375784042aeabe3800c3b445c58da445db7b64 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Apr 2020 22:56:38 +0200 Subject: [PATCH 04/44] Update submodules on '5.15.0' in qt/qt5 Change-Id: I2fe48b7e734bdf86f159af47cd2b6f613172afa2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 36ef8534..5e16aa06 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 36ef85341aacd225839d58880d3f388f31e3100c +Subproject commit 5e16aa067ac6a8b5f031ffcefc356777a0da34ad diff --git a/qtandroidextras b/qtandroidextras index b67ed634..455cddd6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b67ed634117e645b33e200fe4d6b4137f6399df2 +Subproject commit 455cddd68ff84ba54509bf7676f9b02bddb7d214 diff --git a/qtbase b/qtbase index 9e83d268..e6a39c13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9e83d268d6e0bd492fafad823a47cef57b7916c5 +Subproject commit e6a39c13bfe44719ee345419e98638e5f38fe7ee diff --git a/qtdeclarative b/qtdeclarative index 7b9b44d8..4204f543 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7b9b44d8f45c57df1393960807497bd7286d3471 +Subproject commit 4204f543eb82f96bf9f2b45b9b8b5e490517880b diff --git a/qtdoc b/qtdoc index 7cbe7f97..52e67b5b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7cbe7f97ad7585c72b18f786b83122840f7159cc +Subproject commit 52e67b5b4f42f821d411510c3b9675a23c9f5518 diff --git a/qtimageformats b/qtimageformats index c7c320bf..b26e5fbf 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c7c320bf134e6df6a98f10c357ff36e2c8008e53 +Subproject commit b26e5fbf4c50b70ec773a0265c27bb3b262c71ed diff --git a/qtmultimedia b/qtmultimedia index 3ce4b38a..83f0038f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3ce4b38a7c6711ea378a56baec84b73da55a9c84 +Subproject commit 83f0038fa7fd090840fdd19fd30652bd7bbb6fd3 diff --git a/qtqa b/qtqa index ff87df77..a03bac72 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ff87df77b166a4de1c1f6fbd6397fb0c876d9074 +Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 diff --git a/qtquick3d b/qtquick3d index e3d353b6..cf29ed45 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e3d353b6235d658689d65c3e6a5dc25cee430590 +Subproject commit cf29ed45e8cc6ac59ff5ca391c1d05c7361a89c6 diff --git a/qtwayland b/qtwayland index 4bd13402..efc94a48 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4bd13402f0293e85b8dfdf92254e250ac28094c7 +Subproject commit efc94a48526baf92b8a78916e03e1fef5993fa95 diff --git a/qtwebengine b/qtwebengine index 38cbd955..32d2a122 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 38cbd955daeaa66201f17a6928a11972950ef154 +Subproject commit 32d2a1224f05d328ccf6988aa719511906852e12 diff --git a/qtwebsockets b/qtwebsockets index d937c580..6efa2ea5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d937c580ec5ce24a4aad6cc9e4927cad5a93acda +Subproject commit 6efa2ea5fd6eb35fd07b97f643d1e8e376f2eda0 From e2d2d25a570fe48d2eef840f4b2d2f83c09c42fb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Apr 2020 13:27:15 +0000 Subject: [PATCH 05/44] Update submodules on '5.15.0' in qt5 Change-Id: I4e92a9fdd0602c41477345169899623c036e5edb Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index e6a39c13..821e71fd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e6a39c13bfe44719ee345419e98638e5f38fe7ee +Subproject commit 821e71fded090d815b5cd396057ac9823874fe1f diff --git a/qtconnectivity b/qtconnectivity index 35fe7d45..eb908370 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e +Subproject commit eb908370e0c8212cf81f080f4bdbf663273b8063 diff --git a/qtdoc b/qtdoc index 52e67b5b..c09aafd6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 52e67b5b4f42f821d411510c3b9675a23c9f5518 +Subproject commit c09aafd6359c51d20c0504395bafc544a38b59a6 diff --git a/qtquick3d b/qtquick3d index cf29ed45..ba9d56b6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cf29ed45e8cc6ac59ff5ca391c1d05c7361a89c6 +Subproject commit ba9d56b6d89fc70ea4eb331a8e6b1fde242fd68a diff --git a/qttools b/qttools index e967772f..94e86110 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e967772fe884dd8a488a359c122c9cbae9d94c55 +Subproject commit 94e861104a1d689dfd12018e7be377699ab24917 diff --git a/qtwebengine b/qtwebengine index 32d2a122..950e462b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 32d2a1224f05d328ccf6988aa719511906852e12 +Subproject commit 950e462b1d369f8140a1d54078d42b5f057adfdb From 71043ca2438d49c1f9aa64b56cfd453dac384696 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 May 2020 10:33:12 +0300 Subject: [PATCH 06/44] Provisioning: Update expired QNX license Task-number: QTQAINFRA-3708 Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/qnx_700.sh | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh | 2 +- coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 02cd57d3..f344c275 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" -sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz" +sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index d2905e9d..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index b7a5230c..49b71837 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z" Download $url $url $zip -Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" +Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" From 8f653ce4f81887e574241823caf6065ec67a13b6 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 28 Apr 2020 14:53:47 +0300 Subject: [PATCH 07/44] Provisioning: Add sleep before killing gpg-agent in msys installation Task-number: QTQAINFRA-3691 Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920 (cherry picked from commit 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/windows/install-msys2.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index b26df151..784b09dc 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -66,6 +66,9 @@ cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacma Start-Sleep -s 30 cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. +# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. +Start-Sleep -s 180 if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } From 9deba571f95c42f69f8487f4d203d5920ac2dcc7 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 4 May 2020 15:03:58 +0200 Subject: [PATCH 08/44] Temporarily disable QNX builds because license expiry issue Task-number: QTQAINFRA-3708 Change-Id: I676ad2e519ab527e079648d41a1ff015a2a17657 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 7 ----- coin/platform_configs/qt5.yaml | 45 ------------------------------ 2 files changed, 52 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 553232bd..984bec61 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -140,10 +140,3 @@ Configurations: Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index a0b69657..1e49118c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -55,51 +55,6 @@ Configurations: Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'QNX_700' - Target arch: 'x86' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' -- - Template: 'qtci-windows-10-x86_64-17' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' -- - Template: 'qtci-windows-10-x86_64-17' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-windows-10-x86_64-17' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - Template: 'qtci-windows-10-x86_64-17' Target os: 'WebAssembly' From 2bc89aec9b6268716911f0656af001d074b1be84 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 May 2020 23:45:52 +0200 Subject: [PATCH 09/44] Update submodules on '5.15' in qt/qt5 Change-Id: I9d169c17ce5772771e51bc58463919ed7c8ed0a8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 89dc1a18..f0ea852d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 89dc1a1865dd8ed277b88a53262b79a93c2ba8dc +Subproject commit f0ea852d4dd6b3139869a952ee92e74cd367866d diff --git a/qtdeclarative b/qtdeclarative index 1dcd4ff0..a2eef6b5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1dcd4ff086f55392f7d194e2e4a9e4cff599d0f6 +Subproject commit a2eef6b511988b2435c4e39b6b5551e857ce7775 diff --git a/qtlocation b/qtlocation index 36070d45..81e0e599 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 36070d457cdcfc4d0a2629694bb0b34ae8a354b2 +Subproject commit 81e0e5990b1bfec4fcbe49bc37471223fa7a16f1 diff --git a/qtmultimedia b/qtmultimedia index f3c91611..24a2c57e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f3c9161147134bcc848f662947c5a59f3b48e94e +Subproject commit 24a2c57e23fdee0c22b4f957b3b29ddb754b2699 diff --git a/qtquick3d b/qtquick3d index b9f82c50..2e8515c4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b9f82c503a9fa5b861f683763f7c89952fc86c24 +Subproject commit 2e8515c4e8fe899ba37c32fc82a6abe9778cd068 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7d4f8365..80a1ea20 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7d4f8365c1e50759dd3942b006f2ee73ce9cb116 +Subproject commit 80a1ea20d66dea11c74d0a40e1c75b8a782f38a1 diff --git a/qttools b/qttools index dccea132..ff81116c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dccea132cb8bdf3e9a933a64e24b90e46536e3d4 +Subproject commit ff81116cb967edc6707fe62217ad6a701d4d8d1f diff --git a/qtwebengine b/qtwebengine index 75412200..00f7ad50 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 75412200db05ddc5ee2b9aea367b580d8b0c438e +Subproject commit 00f7ad50e99037a121c684726065c416b0b995eb diff --git a/qtxmlpatterns b/qtxmlpatterns index 84b9bd01..fe5abadd 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84b9bd01cbd7a066f3cb34cb7f6c1094aa2346b3 +Subproject commit fe5abadda4ed0cfe7401ac8cfde29736c52a022e From db44923e30ec686030cdd4d8699444b5c2d2a2a7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 May 2020 03:57:06 +0000 Subject: [PATCH 10/44] Update submodules on '5.15.0' in qt5 Change-Id: I9e83c1d5063f0e6013bd1667987cea949e77809a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 821e71fd..6ebef2eb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 821e71fded090d815b5cd396057ac9823874fe1f +Subproject commit 6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e From e85c0e88cf95c5f319827df19e07e286e30b8b3e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 May 2020 19:53:36 +0200 Subject: [PATCH 11/44] Update submodules on '5.15' in qt/qt5 Change-Id: I95cc4f3c7d2b6d745e50c4fe5405527a06423c24 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index f0ea852d..538223d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f0ea852d4dd6b3139869a952ee92e74cd367866d +Subproject commit 538223d10d133d23133db1ec7a50cb2775aca657 diff --git a/qtconnectivity b/qtconnectivity index 35fe7d45..ac95e67f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e +Subproject commit ac95e67f071e7ee8fb1d65d1a4fe1b68ceee7c2d diff --git a/qtlocation b/qtlocation index 81e0e599..197f2bcf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 81e0e5990b1bfec4fcbe49bc37471223fa7a16f1 +Subproject commit 197f2bcf42be6670eb50162fd3c8d8ec6d306eb3 diff --git a/qttools b/qttools index ff81116c..ceb313d9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ff81116cb967edc6707fe62217ad6a701d4d8d1f +Subproject commit ceb313d955294db3cd43a30bcd0bb56674868d62 diff --git a/qtwebengine b/qtwebengine index 00f7ad50..58cd21c0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 00f7ad50e99037a121c684726065c416b0b995eb +Subproject commit 58cd21c0aa7a9dc5a18ea411dcf462a2ee8193f6 From 48ff0140deed43b70c4efe53315fb15ea5e9cdfb Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 22 Apr 2020 14:15:54 +0300 Subject: [PATCH 12/44] Provisioning: Disable windows defender firewall MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Service is still running. It need to be disabled. Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-windows-defender-firewall.ps1 | 1 + .../01-disable-windows-defender-firewall.ps1 | 2 ++ .../01-disable-windows-defender-firewall.ps1 | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 diff --git a/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 b/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 new file mode 100644 index 00000000..f5db6098 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 @@ -0,0 +1 @@ +reg.exe ADD "HKLM\System\CurrentControlSet\Services\mpssvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 new file mode 100644 index 00000000..b00105c4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 new file mode 100644 index 00000000..b00105c4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" + From 826d95df85040ad9f2c8b48a5dfc65402e5e6edb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 May 2020 23:45:57 +0200 Subject: [PATCH 13/44] Update submodules on '5.15' in qt/qt5 Change-Id: I1d5374eb04e8bb23af1581c4f091503ccc1fe310 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtqa | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index a2eef6b5..97b35e73 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a2eef6b511988b2435c4e39b6b5551e857ce7775 +Subproject commit 97b35e73bcc7681d95d5d5a1686ca39dbf60a05b diff --git a/qtqa b/qtqa index a03bac72..62e2b16e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 +Subproject commit 62e2b16e1788fe4d5ea47480b130074a7eb38ae7 diff --git a/qttools b/qttools index ceb313d9..6e65714c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ceb313d955294db3cd43a30bcd0bb56674868d62 +Subproject commit 6e65714cac98c2d355c06c10d355e82cfb07aa4b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 70105b9b..a50db98b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 70105b9b43fecff7cb0ce7a0c84b314e10e8143c +Subproject commit a50db98b23526737a4f7680d4e02ccd455309699 From cb2293ae0a11ecafd5229c2d997ea710236e6d67 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 May 2020 23:45:55 +0200 Subject: [PATCH 14/44] Update submodules on '5.15' in qt/qt5 Change-Id: I4c98f9f6176d4b2c657880ea3d8e106501fc8906 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 37735f11..e11ffc0d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 37735f11f9437b916b194cfd48c452c7c70682f8 +Subproject commit e11ffc0d4f2703904355f25ea076bda41e7c4ec2 diff --git a/qttools b/qttools index 6e65714c..87a86281 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6e65714cac98c2d355c06c10d355e82cfb07aa4b +Subproject commit 87a862817ccdabb3f7c0e34a2b27c94663e3a1f8 diff --git a/qttranslations b/qttranslations index b0be8ca6..3d09ad10 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b0be8ca652f732439e562f75be372730e2452042 +Subproject commit 3d09ad1013caba878618109935775c3a7c5b5816 diff --git a/qtwayland b/qtwayland index 28e7d940..4cf1769a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 28e7d940c42c47cf039522709883ae3de9f4fb88 +Subproject commit 4cf1769a6b5820f0fb3131ce25af240ee3ff70ae From d913a868d47815b87cc3b487b19ff459f5857e07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 May 2020 12:08:38 +0000 Subject: [PATCH 15/44] Update submodules on '5.15.0' in qt/qt5 Change-Id: Ia3881b1668420fed08caf6a4fb8a8b957ac98789 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 6ebef2eb..a8b373d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e +Subproject commit a8b373d678f44a9d7006a412cabc75e7586b2c43 diff --git a/qtdeclarative b/qtdeclarative index 4204f543..829da623 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4204f543eb82f96bf9f2b45b9b8b5e490517880b +Subproject commit 829da623961b9d4e8c3a2236cb9580dec97c2483 diff --git a/qtlocation b/qtlocation index 145a28ad..b2d0a909 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 145a28ad34837bee8ba3d2acd9932d1b7825fd78 +Subproject commit b2d0a90961089057acf199119afa8235e9e926b3 diff --git a/qtnetworkauth b/qtnetworkauth index 6ad275b1..8e6e45b9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 6ad275b1eb35c4e9d75e217adaad4f5101a3bb28 +Subproject commit 8e6e45b990a0ad9bc0d43f1f5387d34a212441bd diff --git a/qtqa b/qtqa index a03bac72..62e2b16e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a03bac72cc715f874b1755c0ee9cdd07bb631b30 +Subproject commit 62e2b16e1788fe4d5ea47480b130074a7eb38ae7 diff --git a/qtwebengine b/qtwebengine index 950e462b..387fb937 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 950e462b1d369f8140a1d54078d42b5f057adfdb +Subproject commit 387fb9377d61683bcd0f59a637afffdd9a16912c From b3777f0703d76731799a7bb74e5c45750da79048 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 May 2020 23:45:51 +0200 Subject: [PATCH 16/44] Update submodules on '5.15' in qt/qt5 Change-Id: I77cfc30c6202b776fc20813f5e71162b6f46c04e Reviewed-by: Qt Submodule Update Bot --- qtmultimedia | 2 +- qtrepotools | 2 +- qttranslations | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtmultimedia b/qtmultimedia index 24a2c57e..516448c6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 24a2c57e23fdee0c22b4f957b3b29ddb754b2699 +Subproject commit 516448c651507fc18210108efd68bf6103c570e0 diff --git a/qtrepotools b/qtrepotools index 8f06a503..062a1654 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 +Subproject commit 062a16545b7c870e392ad9e6f0ce7976659d259e diff --git a/qttranslations b/qttranslations index 3d09ad10..9251c2a5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3d09ad1013caba878618109935775c3a7c5b5816 +Subproject commit 9251c2a5d1d3c0a193ea4492f46bb7576f164918 From d20eaafc5cfe6527fd7f176914d4d6f4074a3159 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 9 May 2020 11:31:05 +0000 Subject: [PATCH 17/44] Update submodules on '5.15.0' in qt/qt5 Change-Id: I7237b1851b031f6b6ec8e949be1b2326228d379d Reviewed-by: Jani Heikkinen --- qtquick3d | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtquick3d b/qtquick3d index ba9d56b6..c9073f11 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ba9d56b6d89fc70ea4eb331a8e6b1fde242fd68a +Subproject commit c9073f11ba540353aa5e3a6f8653569daf9ed606 diff --git a/qtrepotools b/qtrepotools index 8f06a503..062a1654 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8f06a5036a5baba82b01ad696923ea1e9eadb303 +Subproject commit 062a16545b7c870e392ad9e6f0ce7976659d259e From ca2d7b6a5b8697bfd17ca732dee29cd63277b601 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 May 2020 12:26:47 +0000 Subject: [PATCH 18/44] Update submodules on '5.15' in qt/qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4d55ef3f569169b96dbc7b88c9bfd877499e0921 Reviewed-by: Tony Sarajärvi --- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtlocation b/qtlocation index 197f2bcf..d2d4f180 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 197f2bcf42be6670eb50162fd3c8d8ec6d306eb3 +Subproject commit d2d4f180c939929fb324f0e02d4c136e2ca5fcd0 diff --git a/qtmultimedia b/qtmultimedia index 516448c6..f48e16dc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 516448c651507fc18210108efd68bf6103c570e0 +Subproject commit f48e16dc45cde8f634823c40aa573b18673cf13d diff --git a/qtquickcontrols b/qtquickcontrols index 44c239aa..83a41de4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 44c239aa1b9ff3a349f9c88f8ad3abd16aa48f3f +Subproject commit 83a41de459cd8605878842b4410521410132dcb3 diff --git a/qtwayland b/qtwayland index 4cf1769a..1a5b7938 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4cf1769a6b5820f0fb3131ce25af240ee3ff70ae +Subproject commit 1a5b7938c1384381a482448cf079bc682395b54b From 717364e3e10f39f602545c080f34baa064760b7a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 May 2020 13:43:51 +0000 Subject: [PATCH 19/44] Update submodules on '5.15.0' in qt/qt5 Change-Id: I5d348235045f06b87d3cef2752e87bfb5486ab50 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index a8b373d6..ba3b53cb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a8b373d678f44a9d7006a412cabc75e7586b2c43 +Subproject commit ba3b53cb501a77144aa6259e48a8e0edc3d1481d diff --git a/qtdeclarative b/qtdeclarative index 829da623..5a3d9309 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 829da623961b9d4e8c3a2236cb9580dec97c2483 +Subproject commit 5a3d9309ec018445a3471d40366f41ee2f6ebef7 From 69342bb5b7b85a5bee2a8e1bdb7cf3ce80bc5e5c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 12 May 2020 05:28:31 +0000 Subject: [PATCH 20/44] Revert "Provisioning: Disable windows defender firewall" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 48ff0140deed43b70c4efe53315fb15ea5e9cdfb. Reason for revert: QtBase WinRT test qcoreapplication needs mpssvc service to be enabled Change-Id: I523b668d9d7292aaaf7462585dc03819a3973010 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-windows-defender-firewall.ps1 | 1 - .../01-disable-windows-defender-firewall.ps1 | 2 -- .../01-disable-windows-defender-firewall.ps1 | 2 -- 3 files changed, 5 deletions(-) delete mode 100644 coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 diff --git a/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 b/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 deleted file mode 100644 index f5db6098..00000000 --- a/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 +++ /dev/null @@ -1 +0,0 @@ -reg.exe ADD "HKLM\System\CurrentControlSet\Services\mpssvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 deleted file mode 100644 index b00105c4..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" - diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 deleted file mode 100644 index b00105c4..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" - From bca97664c6b12f1a1965b2eb20c20894b3f31ead Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 May 2020 23:46:08 +0200 Subject: [PATCH 21/44] Update submodules on '5.15' in qt/qt5 Change-Id: Id17a8894c6eb326e68a5cad454ee193fb4b0381e Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 97b35e73..8279fb44 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 97b35e73bcc7681d95d5d5a1686ca39dbf60a05b +Subproject commit 8279fb44cba551e139f307217da24d3f26a86c2e diff --git a/qtmultimedia b/qtmultimedia index f48e16dc..54144064 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f48e16dc45cde8f634823c40aa573b18673cf13d +Subproject commit 541440649aac5488a8cb44f0c867095b18405c49 diff --git a/qtwebengine b/qtwebengine index 58cd21c0..c7352983 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 58cd21c0aa7a9dc5a18ea411dcf462a2ee8193f6 +Subproject commit c7352983348d666ed1a72cdda7ee48467898fbfa From 38139878ffdfea6b45d61bc3d071e7a244264516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 12 Mar 2020 07:38:09 +0000 Subject: [PATCH 22/44] Install GCC 10 on SLES 15 Task-number: QTQAINFRA-3444 Change-Id: Iaf9b3ea5331cfc0b3d19a09f55aa4df1de93fbb2 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 3ea67ef0..638a9387 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -37,7 +37,16 @@ set -ex sudo zypper -nq install elfutils binutils -sudo zypper -nq install git gcc gcc-c++ make patch wget tar +sudo zypper addrepo --no-gpgcheck https://download.opensuse.org/repositories/devel:gcc/SLE-15/devel:gcc.repo +sudo zypper refresh +sudo zypper -nq install --force-resolution gcc10 gcc10-c++ + +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ + --slave /usr/bin/cc cc /usr/bin/gcc-10 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-10 + +sudo zypper -nq install git make patch wget tar sudo zypper -nq install bison flex gperf \ zlib-devel \ From f4b02da372a602b792c39d97d72727efbd86b37c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 May 2020 23:47:06 +0200 Subject: [PATCH 23/44] Update submodules on '5.15' in qt/qt5 Change-Id: I6e5027ff7b70605a77f35b42f07a0e3ad9bb2f12 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 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 +- 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 e11ffc0d..1f1f4b77 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e11ffc0d4f2703904355f25ea076bda41e7c4ec2 +Subproject commit 1f1f4b779382289abba98c5914ff18f593124bac diff --git a/qtactiveqt b/qtactiveqt index a0ddb6ac..bd9c3d98 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a0ddb6ace7a8cb9114d01d64e0722b0e00e5b0b3 +Subproject commit bd9c3d98febae9065366dcd20109690bc05e1005 diff --git a/qtandroidextras b/qtandroidextras index aa346dcc..a943ae88 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit aa346dcc8d8fbab9f5877d4822c06a92f521ce7b +Subproject commit a943ae881a897f0bacfdda94725a2bfd6028766e diff --git a/qtbase b/qtbase index 538223d1..76fe3664 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 538223d10d133d23133db1ec7a50cb2775aca657 +Subproject commit 76fe36645eb41fa35e526a97874f1e15a39c3823 diff --git a/qtcharts b/qtcharts index 7cdded63..df3f638f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7cdded63b5d9d6b81c9d03a2f39d94d7b5230ccb +Subproject commit df3f638f19c4a7bb506a23c72d7ff9a51681f78b diff --git a/qtdatavis3d b/qtdatavis3d index 24c043fb..8ea21240 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 24c043fbffdbd7c0e060f05f67ad28824ac05e6b +Subproject commit 8ea21240c33ded74bc30f1dd2accf5718eb07574 diff --git a/qtdeclarative b/qtdeclarative index 8279fb44..3ed33ec7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8279fb44cba551e139f307217da24d3f26a86c2e +Subproject commit 3ed33ec74b70bbac016dd080889bb3df3a78d90c diff --git a/qtdoc b/qtdoc index 1c7c6961..d16c0c0f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1c7c69619028bf5247309d49a8edd9359ef6649f +Subproject commit d16c0c0fa8ae7754c38babf192082fb7c0a0180e diff --git a/qtgamepad b/qtgamepad index 996ccf5b..f1e9844f 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 996ccf5bbacab0d16cbd961987c08385279ad6c5 +Subproject commit f1e9844fa72f755efdf52040cd08844a7a46a3e7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7665821b..8c8a715a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7665821bc4baed9c6595d22dcaf2857e2dda77f7 +Subproject commit 8c8a715a5ad0f3a7405f95c58f7e6586b7835161 diff --git a/qtimageformats b/qtimageformats index 26c54809..ec15f82b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 26c548096b8f77b0e2f0cf0602a64d65e7958d67 +Subproject commit ec15f82b67b851d9dc789cc292c662a988100534 diff --git a/qtlottie b/qtlottie index f5cc3184..a0918d13 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f5cc3184f30c9fa1b81d931430aaa4f6f23267a3 +Subproject commit a0918d137c318d8c9cad6f7db1ffca1f18c305c6 diff --git a/qtmacextras b/qtmacextras index 66a5de12..061b6abf 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 66a5de12b601e3de8ec336ae42c795002f539a8d +Subproject commit 061b6abfc2309e9d513cfa758b0201985b3f1a6d diff --git a/qtmultimedia b/qtmultimedia index 54144064..89f92578 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 541440649aac5488a8cb44f0c867095b18405c49 +Subproject commit 89f92578ece66aaa50e03cacd81434cd18006185 diff --git a/qtnetworkauth b/qtnetworkauth index 5f9fbc2a..9f6f71d7 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5f9fbc2a6e3f06ae388af259e074b00c491c163d +Subproject commit 9f6f71d7b1eaf7821a0083894863b1b3d2a1e3ef diff --git a/qtpurchasing b/qtpurchasing index c9a2a6dc..ac5a9b96 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit c9a2a6dcb858d2de5c908914cfe6564fa0740469 +Subproject commit ac5a9b9615ba80e5b7b57c689cfba2b657b4e612 diff --git a/qtquick3d b/qtquick3d index 2e8515c4..080d5770 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2e8515c4e8fe899ba37c32fc82a6abe9778cd068 +Subproject commit 080d5770395dd4491ab57c643b278a1ecbde3e8f diff --git a/qtquickcontrols b/qtquickcontrols index 83a41de4..340e1d21 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 83a41de459cd8605878842b4410521410132dcb3 +Subproject commit 340e1d21a5ad3976f9131641da9cbdc7b3fbacb4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 80a1ea20..645cfaef 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 80a1ea20d66dea11c74d0a40e1c75b8a782f38a1 +Subproject commit 645cfaef177fd5962ab1536bc06326a55d4a49e2 diff --git a/qtquicktimeline b/qtquicktimeline index 05c2a520..e993bd51 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 05c2a52042e8ac7f73da643bfa9107c10c346537 +Subproject commit e993bd51b8a6a4dcab9303b9e1991a271e086c60 diff --git a/qtremoteobjects b/qtremoteobjects index 0b98fb2b..be49da7e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0b98fb2b3f59143ff8f71f7f53309e153e5af81e +Subproject commit be49da7ec275e4fbbc678810bf7264197099eeee diff --git a/qtrepotools b/qtrepotools index 062a1654..b4d7abe9 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 062a16545b7c870e392ad9e6f0ce7976659d259e +Subproject commit b4d7abe9eb7018b2013bc23371d7d2454a73c598 diff --git a/qtscript b/qtscript index a5c819ce..00258fe3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a5c819cef6efa06c8273c9b5e5e6406a0ae9c469 +Subproject commit 00258fe35231b8d42fe00c39ba5bd1b00a8dc278 diff --git a/qtscxml b/qtscxml index db8b84e1..cc1239fd 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit db8b84e117905b4792524aacddba314ae4a2f7ba +Subproject commit cc1239fd22b9de56ca13204f4ec67a50032e808a diff --git a/qtsensors b/qtsensors index 5acdc122..be24a7a4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5acdc122a455bae920e9054bec4f3d769cce105e +Subproject commit be24a7a43cfe4db4c9a9d95f9321c8abec3b0ae7 diff --git a/qtserialbus b/qtserialbus index 1d5fa84e..c12af883 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1d5fa84ed9b450954a0d82e598570ec2107a5953 +Subproject commit c12af8832389785b8be7ffcdddcdb8480c1e124d diff --git a/qtserialport b/qtserialport index c24fd462..49335de3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c24fd46221b98eb2e9248765ae32c0fccbebcd35 +Subproject commit 49335de3e7690ae6d7992dace29b86ef4ae246d1 diff --git a/qtspeech b/qtspeech index 387f4b6b..919fabda 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 387f4b6b379ac82ff4625ced5a2f1af7c4ee865e +Subproject commit 919fabda135581968dce297b62eb9b69da7a772f diff --git a/qtsvg b/qtsvg index a26b32e1..d882e195 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a26b32e157e4e7cd8ce90b933c4c45ed5360b388 +Subproject commit d882e195406ccedd418f529ecf6320659abf0b5e diff --git a/qttools b/qttools index 87a86281..814f95db 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 87a862817ccdabb3f7c0e34a2b27c94663e3a1f8 +Subproject commit 814f95db87f469abf8386825cf2db2ecc208c62b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a50db98b..2d0686c8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a50db98b23526737a4f7680d4e02ccd455309699 +Subproject commit 2d0686c879240f5d47347439da39f499f0434434 diff --git a/qtwayland b/qtwayland index 1a5b7938..76eda41d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1a5b7938c1384381a482448cf079bc682395b54b +Subproject commit 76eda41dab9ddccf4c2a38d981c9b03bc7f051d0 diff --git a/qtwebchannel b/qtwebchannel index e38d01e7..3342da90 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e38d01e78530048339722f711d58d1404b2484c0 +Subproject commit 3342da908955187a4543cdc38e0fad2e78e936e7 diff --git a/qtwebengine b/qtwebengine index c7352983..4242f2e6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c7352983348d666ed1a72cdda7ee48467898fbfa +Subproject commit 4242f2e65493349af091c0f588182493090dbed2 diff --git a/qtwebglplugin b/qtwebglplugin index 219abce4..942de9e9 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 219abce4c8fcfbbae13b66c142ee0fd1afd04313 +Subproject commit 942de9e990a64cf012f3c7c42304d3eda5121139 diff --git a/qtwebsockets b/qtwebsockets index 593466b4..432176cc 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 593466b4b902536743050e088a0e4eee9f007c76 +Subproject commit 432176cc8f377046e2216ade3fb4c43d27ec8938 diff --git a/qtwebview b/qtwebview index a15f2b83..1b514c3b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a15f2b83c42286ab7f4b4c406e4795b6a1a9a13e +Subproject commit 1b514c3b7d1b5d6ddfbfd818cf878a425d2b5f8b diff --git a/qtwinextras b/qtwinextras index acb8cbb1..b8d402e1 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit acb8cbb19c8cda386e02e1c898291cc95e1be031 +Subproject commit b8d402e143627916214b1a7552da9d84920063c6 diff --git a/qtx11extras b/qtx11extras index e05196b4..17a9d40a 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit e05196b4648e8ea28bbeea3491754c1c6db4a60c +Subproject commit 17a9d40a3e808145aef8de08b79d21cf7df45421 diff --git a/qtxmlpatterns b/qtxmlpatterns index fe5abadd..0c04a447 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fe5abadda4ed0cfe7401ac8cfde29736c52a022e +Subproject commit 0c04a447ca53642e33fde1f4ada6debc435837e7 From cbb4768052e8a9ab415bae8ab48a9aaafaf94ef6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 May 2020 23:46:31 +0200 Subject: [PATCH 24/44] Update submodules on '5.15' in qt/qt5 Change-Id: Ia54db5b603a3e31c570d1c7e4ab4cd409b9bd53e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 1f1f4b77..b297d6bf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1f1f4b779382289abba98c5914ff18f593124bac +Subproject commit b297d6bfdfd2116ccbed1e552fc0cbe68ea274f3 diff --git a/qtactiveqt b/qtactiveqt index bd9c3d98..72215e4c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bd9c3d98febae9065366dcd20109690bc05e1005 +Subproject commit 72215e4c7c6a42723b138ac97a603af011bd81d2 diff --git a/qtandroidextras b/qtandroidextras index a943ae88..b80262f9 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a943ae881a897f0bacfdda94725a2bfd6028766e +Subproject commit b80262f9d844b01c713c7df32754fc8194de900f diff --git a/qtbase b/qtbase index 76fe3664..0d4b67a9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 76fe36645eb41fa35e526a97874f1e15a39c3823 +Subproject commit 0d4b67a95bae32d6eb4b9f8ff768f6449e9b2b2b diff --git a/qtcharts b/qtcharts index df3f638f..985d9f42 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit df3f638f19c4a7bb506a23c72d7ff9a51681f78b +Subproject commit 985d9f42f7691a5b96f9d55b96c83e7f8debfee1 diff --git a/qtdeclarative b/qtdeclarative index 3ed33ec7..a3b34aaf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3ed33ec74b70bbac016dd080889bb3df3a78d90c +Subproject commit a3b34aaf625489364c87028a7d3a37cac1faeb7c diff --git a/qtdoc b/qtdoc index d16c0c0f..086dcc8c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d16c0c0fa8ae7754c38babf192082fb7c0a0180e +Subproject commit 086dcc8c9d2f2f0631b62e983d190ddbb3c4b43d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 8c8a715a..83e9a15a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 8c8a715a5ad0f3a7405f95c58f7e6586b7835161 +Subproject commit 83e9a15a523e86718f99d47d5b3b516ab95d5ae2 diff --git a/qtquickcontrols b/qtquickcontrols index 340e1d21..55e2298f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 340e1d21a5ad3976f9131641da9cbdc7b3fbacb4 +Subproject commit 55e2298f3ff0130fddb09ccd1bcfddce61a8abdb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 645cfaef..7027b204 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 645cfaef177fd5962ab1536bc06326a55d4a49e2 +Subproject commit 7027b2040be5c9675e542244dc457f208d903612 diff --git a/qtrepotools b/qtrepotools index b4d7abe9..c7cccea4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit b4d7abe9eb7018b2013bc23371d7d2454a73c598 +Subproject commit c7cccea498425db98ad276d5b43ddb1148f88921 diff --git a/qtsvg b/qtsvg index d882e195..c2d3f283 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d882e195406ccedd418f529ecf6320659abf0b5e +Subproject commit c2d3f2833a3480d1254233a1c2a567b4e6b8bfdd diff --git a/qttools b/qttools index 814f95db..27f8fe5b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 814f95db87f469abf8386825cf2db2ecc208c62b +Subproject commit 27f8fe5b21ac555cda9d16b2581f02a4305df1ea diff --git a/qtwayland b/qtwayland index 76eda41d..e18cfb5a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 76eda41dab9ddccf4c2a38d981c9b03bc7f051d0 +Subproject commit e18cfb5a129afb3e5e2f429436277ae4dc565e6e diff --git a/qtwebengine b/qtwebengine index 4242f2e6..14a4267d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4242f2e65493349af091c0f588182493090dbed2 +Subproject commit 14a4267dec9be4e6230bfa52f295f6c43b1e23f7 diff --git a/qtwebsockets b/qtwebsockets index 432176cc..34010e64 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 432176cc8f377046e2216ade3fb4c43d27ec8938 +Subproject commit 34010e649734fe7a41d1a0280c606b15de5c2799 From 4f504b9e3f7b103dca64dcd747dcc7e26d68f999 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 May 2020 23:46:48 +0200 Subject: [PATCH 25/44] Update submodules on '5.15' in qt/qt5 Change-Id: I2cc7f7cd47bbf116a3cc01b42c58d0e09162ac3e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index b297d6bf..e620bcde 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b297d6bfdfd2116ccbed1e552fc0cbe68ea274f3 +Subproject commit e620bcded0e98772983252f0dddf8199f1b46357 diff --git a/qtactiveqt b/qtactiveqt index 72215e4c..cddd08a9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 72215e4c7c6a42723b138ac97a603af011bd81d2 +Subproject commit cddd08a9ed92aff9f86b0fde86cfac980bec52ea diff --git a/qtbase b/qtbase index 0d4b67a9..d148b52f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d4b67a95bae32d6eb4b9f8ff768f6449e9b2b2b +Subproject commit d148b52f8792aab3d225f258e58609c22af5f342 diff --git a/qtcharts b/qtcharts index 985d9f42..b1edcbc8 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 985d9f42f7691a5b96f9d55b96c83e7f8debfee1 +Subproject commit b1edcbc8b040455b76b1ac3c1762867c88e76287 diff --git a/qtdeclarative b/qtdeclarative index a3b34aaf..77dc5bcf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a3b34aaf625489364c87028a7d3a37cac1faeb7c +Subproject commit 77dc5bcf368abb594e21230504419a48346b6753 diff --git a/qtimageformats b/qtimageformats index ec15f82b..1a790ba6 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ec15f82b67b851d9dc789cc292c662a988100534 +Subproject commit 1a790ba6151a3128b49d3dc556d3373dbda9f9d1 diff --git a/qtlocation b/qtlocation index d2d4f180..e73246b0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d2d4f180c939929fb324f0e02d4c136e2ca5fcd0 +Subproject commit e73246b0e575a14bd88a84f67543b7e9b50960d5 diff --git a/qtqa b/qtqa index 62e2b16e..354c7577 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 62e2b16e1788fe4d5ea47480b130074a7eb38ae7 +Subproject commit 354c7577188cfffd417fd973b8611d84174eba85 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7027b204..2a1d4206 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7027b2040be5c9675e542244dc457f208d903612 +Subproject commit 2a1d4206c00e70bc9ffb2f4ddc58822efc3ced91 diff --git a/qtscxml b/qtscxml index cc1239fd..a11be672 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit cc1239fd22b9de56ca13204f4ec67a50032e808a +Subproject commit a11be67255140abd48f91a3d5f7ae4c3ee8e4341 diff --git a/qttools b/qttools index 27f8fe5b..fb4fbc21 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 27f8fe5b21ac555cda9d16b2581f02a4305df1ea +Subproject commit fb4fbc21c4b5ff6ce1719add142e96d567918940 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2d0686c8..4cf279a5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2d0686c879240f5d47347439da39f499f0434434 +Subproject commit 4cf279a5e6ad49720506a6825f008a773f5e951e diff --git a/qtwayland b/qtwayland index e18cfb5a..b9c33b13 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e18cfb5a129afb3e5e2f429436277ae4dc565e6e +Subproject commit b9c33b13a0cda7c23b4cb129125cef09db5e0c82 diff --git a/qtwebengine b/qtwebengine index 14a4267d..7b6d15cd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 14a4267dec9be4e6230bfa52f295f6c43b1e23f7 +Subproject commit 7b6d15cdf271772695d28bf48f1f41a29dc29e28 diff --git a/qtwebglplugin b/qtwebglplugin index 942de9e9..5488f073 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 942de9e990a64cf012f3c7c42304d3eda5121139 +Subproject commit 5488f0731ebe9c5566abb897f0cb8d298c5944da From 16ca898568037a5edd7c9cd63467fd871ad47020 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Mar 2020 08:15:17 +0300 Subject: [PATCH 26/44] Provisioning: Update QNX7 SDP to include OpenSSL 1.1.1 Still includes ICU 58 Task-number: QTQAINFRA-3537 Change-Id: I2f532ff32157e09eeec9a2196d075d4ec6347df5 Reviewed-by: Samuli Piippo --- coin/platform_configs/default.yaml | 7 +++ coin/platform_configs/qt5.yaml | 45 +++++++++++++++++++ coin/provisioning/common/linux/qnx_700.sh | 4 +- .../qtci-macos-10.13-x86_64/40-qnx700.sh | 2 +- .../qtci-macos-10.14-x86_64/40-qnx700.sh | 5 +-- .../qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 +- 6 files changed, 59 insertions(+), 8 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 984bec61..0aa4d97b 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -140,3 +140,10 @@ Configurations: Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'QNX_700' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 1e49118c..e467497f 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -55,6 +55,51 @@ Configurations: Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'QNX_700' + Target arch: 'x86' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' +- + Template: 'qtci-windows-10-x86_64-17' + Target os: 'QNX_700' + Target arch: 'armv7' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' +- + Template: 'qtci-windows-10-x86_64-17' + Target os: 'QNX_700' + Target arch: 'armv8' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' +- + Template: 'qtci-windows-10-x86_64-17' + Target os: 'QNX_700' + Target arch: 'x86_64' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'QNX_700' + Target arch: 'armv8' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'QNX_700' + Target arch: 'x86_64' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - Template: 'qtci-windows-10-x86_64-17' Target os: 'WebAssembly' diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 02cd57d3..b0424529 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" -sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20200326-linux.tar.xz" +sha1="a92f2d6c649aa03e91a216dfa9df003fa00c033e" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index d2905e9d..f134951a 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20200326-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..7f1f1233 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20200326-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" @@ -54,4 +54,3 @@ fi # Set env variables echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc echo "QNX SDP = 7.0.0" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index b7a5230c..986416fd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20200326-windows.7z" Download $url $url $zip -Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" +Verify-Checksum $zip "ac3e780ba2fc68932d7f23c51bdc646d03e2e91f" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" From 9a4fc7074c72b1c7bb8bf2dd2f3886aa87d04530 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 26 May 2020 23:46:50 +0200 Subject: [PATCH 27/44] Update submodules on '5.15' in qt/qt5 Change-Id: Iaf309cc8b2404cd9a34a6b5b04331a3acc33794f Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index e620bcde..bfefac65 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e620bcded0e98772983252f0dddf8199f1b46357 +Subproject commit bfefac652ba826ab95a4969ef31acc02b6ef067f diff --git a/qtandroidextras b/qtandroidextras index b80262f9..73684040 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b80262f9d844b01c713c7df32754fc8194de900f +Subproject commit 73684040207ce0cbb782dda5dc27cb8ac71243b3 diff --git a/qtbase b/qtbase index d148b52f..e8505d99 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d148b52f8792aab3d225f258e58609c22af5f342 +Subproject commit e8505d9923ba48124bf82bf358f8629b3fcdc41b diff --git a/qtdeclarative b/qtdeclarative index 77dc5bcf..02518f24 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 77dc5bcf368abb594e21230504419a48346b6753 +Subproject commit 02518f242d589ebee93adafb2aa8cc630683cb7f diff --git a/qtquick3d b/qtquick3d index 080d5770..54d80070 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 080d5770395dd4491ab57c643b278a1ecbde3e8f +Subproject commit 54d800707808ccdb2d7f17e72f6fd9429573b8fd diff --git a/qtquickcontrols b/qtquickcontrols index 55e2298f..e5fb9e4c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 55e2298f3ff0130fddb09ccd1bcfddce61a8abdb +Subproject commit e5fb9e4ceabc2f1bfd89d3b3cb0a69c7d74df5b8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2a1d4206..dc6b423a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2a1d4206c00e70bc9ffb2f4ddc58822efc3ced91 +Subproject commit dc6b423a2f642052dbd38de0d8b76ed7435e77fa diff --git a/qtrepotools b/qtrepotools index c7cccea4..050705f6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c7cccea498425db98ad276d5b43ddb1148f88921 +Subproject commit 050705f615e5c54acc7d2c1190d2d997a0d1c3ce diff --git a/qtscript b/qtscript index 00258fe3..0f6ea351 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 00258fe35231b8d42fe00c39ba5bd1b00a8dc278 +Subproject commit 0f6ea3515260438b3a51bc6e4d4e4480261484ff diff --git a/qttools b/qttools index fb4fbc21..f49dedad 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fb4fbc21c4b5ff6ce1719add142e96d567918940 +Subproject commit f49dedadfca3474b18478ca74ec774110768682f diff --git a/qttranslations b/qttranslations index 9251c2a5..132bdb78 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9251c2a5d1d3c0a193ea4492f46bb7576f164918 +Subproject commit 132bdb78342692f6f0ad2a6c703d9a67dc0227f0 diff --git a/qtwebengine b/qtwebengine index 7b6d15cd..84a4324f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7b6d15cdf271772695d28bf48f1f41a29dc29e28 +Subproject commit 84a4324fd3b947b7464b5ea04453da2a7a25730e From a8e64fec515dd4910b574b23f37e4591e66ca133 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 May 2020 22:15:58 +0200 Subject: [PATCH 28/44] Update submodules on '5.15' in qt/qt5 Change-Id: I9f93151930b634d7dcccd717d516717ccd2f4ef1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlottie | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index bfefac65..83ee10ff 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bfefac652ba826ab95a4969ef31acc02b6ef067f +Subproject commit 83ee10ff799fa5892b14a677036fb445ae16b10b diff --git a/qtbase b/qtbase index e8505d99..07fd688c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e8505d9923ba48124bf82bf358f8629b3fcdc41b +Subproject commit 07fd688ce4cfeee283b575aa849d6ddf5a4b8ad7 diff --git a/qtdeclarative b/qtdeclarative index 02518f24..7064e09e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 02518f242d589ebee93adafb2aa8cc630683cb7f +Subproject commit 7064e09e3a79f630356d8085c1bacae8ff5ff852 diff --git a/qtlottie b/qtlottie index a0918d13..43c7e0a0 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a0918d137c318d8c9cad6f7db1ffca1f18c305c6 +Subproject commit 43c7e0a05fd350c1bbcd3127307906bba7c12d0b diff --git a/qtmultimedia b/qtmultimedia index 89f92578..603f1081 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 89f92578ece66aaa50e03cacd81434cd18006185 +Subproject commit 603f108126e71e8a13011561b95f66f3deb69edc diff --git a/qtquick3d b/qtquick3d index 54d80070..31122e51 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 54d800707808ccdb2d7f17e72f6fd9429573b8fd +Subproject commit 31122e51d3253bf6f3bebc57745f04a3c6941c80 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc6b423a..0924bd35 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc6b423a2f642052dbd38de0d8b76ed7435e77fa +Subproject commit 0924bd35dce68adf5dc1fc0514f49a978bea2a45 diff --git a/qttools b/qttools index f49dedad..e1c5282d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f49dedadfca3474b18478ca74ec774110768682f +Subproject commit e1c5282d9f97bc2068107d4625933c7fefb9f0cc diff --git a/qtwayland b/qtwayland index b9c33b13..5cba07a6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b9c33b13a0cda7c23b4cb129125cef09db5e0c82 +Subproject commit 5cba07a66225d6ecedb1d9e952d272e236f30aa8 diff --git a/qtwebengine b/qtwebengine index 84a4324f..29a687c1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 84a4324fd3b947b7464b5ea04453da2a7a25730e +Subproject commit 29a687c1743dbb0ba42bab08e751755eec3454a8 From 32595beb435e6071586f2778cd07e2827e44ada7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 31 May 2020 23:46:50 +0200 Subject: [PATCH 29/44] Update submodules on '5.15' in qt/qt5 Change-Id: If098f9985eba623be0b8a1c1f4213fe529058fb8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 07fd688c..4de8dd50 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 07fd688ce4cfeee283b575aa849d6ddf5a4b8ad7 +Subproject commit 4de8dd50d54f0cd5d83105a048d06d16fd89a878 From 5279f32fdf97daf849e73d56739ca4f1256a9bf5 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 24 Mar 2020 11:00:17 +0200 Subject: [PATCH 30/44] Provisioning: Fetch pre-installed squish from local cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish installation is flaky so the installation phase has been moved from provisioning to Jenkins. Jenkins job will install the squish to target VM and copy it to local cache. This change only fetch the installed squish packages from local cache and uncompress those to VMs. Task-number: QTQAINFRA-3510 Task-number: QTQAINFRA-3107 Change-Id: I862da3250120dc6a43d9c04d973a25a691ca66a1 Reviewed-by: Tony Sarajärvi (cherry picked from commit b0286d6cd6c86cfc3c5dbd5a3879354996632831) Reviewed-by: Toni Saario --- .../provisioning/common/unix/squishInstall.sh | 170 +++++++----------- .../common/windows/squishInstall.ps1 | 134 ++++---------- 2 files changed, 92 insertions(+), 212 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 24a4d507..a0c23350 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,120 +33,80 @@ ## ############################################################################# +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + set -ex -# This script will install squish package for Linux and Mac. +# This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.5" -# Branch version without dot -qtBranch="513x" -squishFolder="/opt/squish" -squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" +version="6.5.2" +qtBranch="514x" +installFolder="/opt" +squishFolder="$installFolder/squish" +preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/.squish-3-license" if uname -a |grep -q Darwin; then - squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14" +else + compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" + sha1="63f33de55770e2588dd9f482546900e33d20f8ec" fi -squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" -squishLicenseFile=".squish-3-license.tar.gz" - -testSuite="suite_test_squish" -testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" - -# These checks can be removed when Vanilla OS for all linux and Mac are in -if [ -d "$squishFolder" ]; then - echo "Move old squish to /tmp" - sudo mv "$squishFolder" "/tmp/squish_$(date)" +# Check which platform +if uname -a |grep -q Darwin; then + usersGroup="staff" + mountFolder="/Volumes" + squishLicenseDir="/Users/qt" +elif uname -a |grep -q "el7"; then + usersGroup="qt" + mountFolder="/tmp" + squishLicenseDir="/root" +elif uname -a |grep -q "Ubuntu"; then + usersGroup="users" + mountFolder="/tmp" + squishLicenseDir="/home/qt" +else + usersGroup="users" + mountFolder="/tmp" + squishLicenseDir="/root" fi -if [ -f "/etc/profile.d/squish_env.sh" ]; then - echo "Remove /etc/profile.d/squish_env.sh" - sudo rm -f "/etc/profile.d/squish_env.sh" - export SQUISH_LICENSEKEY_DIR=$HOME +targetFileMount="$mountFolder"/"$compressedFolder" + +echo "Mounting $preBuildCacheUrl to $mountFolder" +sudo mount "$preBuildCacheUrl" "$mountFolder" +echo "Create $installFolder if needed" +if [ ! -d "$installFolder" ]; then + sudo mkdir "$installFolder" fi -function MountAndInstall { - url=$1 - targetDirectory=$2 - targetFile=$3 +VerifyHash "$targetFileMount" "$sha1" - # Check which platform - if uname -a |grep -q Darwin; then - usersGroup="staff" - mountFolder="/Volumes" - squishLicenseDir="/Users/qt" - elif uname -a |grep -q "el7"; then - usersGroup="qt" - mountFolder="/tmp" - squishLicenseDir="/root" - elif uname -a |grep -q "Ubuntu"; then - usersGroup="users" - mountFolder="/tmp" - squishLicenseDir="/home/qt" - else - usersGroup="users" - mountFolder="/tmp" - squishLicenseDir="/root" +echo "Uncompress $compressedFolder" +sudo tar -xzf "$targetFileMount" --directory "$installFolder" + +echo "Unmounting $mountFolder" +sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" + +sudo mv "$installFolder/rta_squish_$version" "$squishFolder" + +if uname -a |grep -q "Ubuntu"; then + if [ ! -e "/usr/lib/tcl8.6" ]; then + sudo mkdir /usr/lib/tcl8.6 + sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi +fi - function UnMount { - echo "Unmounting $mountFolder" - sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - } +DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license" - targetFileMount="$mountFolder"/"$targetFile" - - echo "Mounting $url to $mountFolder" - sudo mount "$url" "$mountFolder" - echo "Create $targetDirectory if needed" - if [ ! -d "/opt" ]; then - sudo mkdir "/opt" - fi - if [ ! -d "$targetDirectory" ]; then - sudo mkdir "$targetDirectory" - fi - echo "Uncompress $targetFile" - if [[ $targetFile == *.tar.gz ]]; then - if [[ $targetFile == .squish-3-license.* ]]; then - target="$squishLicenseDir" - # Squish license need to be exists also in users home directory, because squish check it before it starts running tests - sudo tar -xzf "$targetFileMount" --directory "$HOME" - else - target="$targetDirectory" - fi - sudo tar -xzf "$targetFileMount" --directory "$target" - UnMount - elif [[ $targetFile == *.dmg ]]; then - echo "'dmg-file', no need to uncompress" - sudo cp $targetFileMount /tmp - UnMount - sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null - mountFolder="/Volumes/froglogic Squish" - UnMount - elif [[ $targetFile == *.run ]]; then - echo "'run-file', no need to uncompress" - sudo cp $targetFileMount $targetDirectory - UnMount - sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null - sudo rm -fr "$targetDirectory/$targetFile" - if uname -a |grep -q "Ubuntu"; then - sudo mkdir /usr/lib/tcl8.6 - sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ - fi - else - exit 1 - fi - - echo "Changing ownerships" - sudo chown -R qt:$usersGroup "$targetDirectory" - sudo chown qt:$usersGroup "$HOME/.squish-3-license" -} +echo "Changing ownerships" +sudo chown -R qt:$usersGroup "$squishFolder" +sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" - if uname -a |grep -q "Ubuntu"; then echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile @@ -155,19 +115,11 @@ else echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc fi -echo "Installing squish license to home directory.." -MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" - -echo "Installing squish $version.." -MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" - -echo "Installing provisioning scripts for squish" -MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz" - -echo "Verifying Squish Installation" -if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then +echo "Verifying Squish" +if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then echo "Squish installation tested successfully" else echo "Squish test failed! Package wasn't installed correctly." exit 1 fi + diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index f8d600d7..8396743e 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,120 +33,48 @@ . "$PSScriptRoot\helpers.ps1" -# This script will install squish package for Windows. +# This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -# NOTE! Make sure 64bit versions are always installed before 32bit, -# because they use same folder name before a rename - -$version = "6.5" - -# Qt branch without dot (*.*) -$qtBranch = "513x" -# 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. +$version = "6.5.2" +$qtBranch = "514x" $targetDir = "C:\Utils\squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" -$squishBranchUrl = "$squishUrl\$qtBranch" -$testSuite = "suite_test_squish" -$testSuiteUrl = "$squishUrl\$testSuite.7z" +$squishPackage = "C:\Utils\rta_squish" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license $licensePackage = ".squish-3-license" +Write-Host "Installing Squish license to home directory" +Copy-Item $licenseUrl\$licensePackage ~\$licensePackage + +if (Is64BitWinHost) { + $arch = "x64" +} else { + $arch = "x86" +} + $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName -Function DownloadAndInstallSquish { - Param ( - [string]$version, - [string]$bit, - [string]$squishPackage - ) - $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" - $SquishInstaller = "$targetDir\$squishPackage.exe" - $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" - - Write-Host "Fetching from URL $squishUrl" - Copy-Item "$SquishUrl" "$SquishInstaller" - Write-Host "Installing Squish" - $stdoutFile = [System.IO.Path]::GetTempFileName() - $stderrFile = [System.IO.Path]::GetTempFileName() - Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null - Remove-Item -Path $SquishInstaller - if ("$bit" -eq "win64") { - if ($squishPackage.StartsWith("mingw")) { - $squishPackage64bit = "mingw_64" - } else { - $squishPackage64bit = "$squishPackage`_64" - } - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit - TestSquish $squishPackage64bit - } else { - if ($squishPackage.StartsWith("mingw")) { - Rename-Item $targetDir\$squishPackage $targetDir\mingw - TestSquish mingw - } else { - TestSquish $squishPackage - } - } -} - -Function DownloadSquishLicence { - Param ( - [string]$squishUrl - ) - - Write-Host "Installing Squish license to home directory" - Copy-Item $squishUrl\$licensePackage ~\$licensePackage -} - -Function TestSquish { - Param ( - [string]$squishPackage - ) - - Write-Host "Verifying Squish Installation" - if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") { - Write-Host "Squish installation tested successfully!" - } else { - Write-Host "Squish test failed! $squishPackage wasn't installed correctly." - [Environment]::Exit(1) - } -} - -Write-Host "Creating $targetDir" -New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" - -Write-Host "Download and install Test Suite for squish" -Copy-Item $testSuiteUrl $targetDir/$testSuite.7z -Extract-7Zip $targetDir/$testSuite.7z $targetDir - -DownloadSquishLicence $squishUrl - if ($OSVersion -eq "Windows 10 Enterprise") { - + $winVersion = "win10" if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - DownloadAndInstallSquish $version win64 "msvc141" - DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + $sha1 = "9262d3b749483094024c74986f93e9340afbdb62" } else { - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" + $sha1 = "0763b344afa327e6c374971492021c5e923be892" } - DownloadAndInstallSquish $version win32 "msvc141" - -} elseif ($OSVersion -eq "Windows 8.1 Enterprise") { - - if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - } - DownloadAndInstallSquish $version win32 "msvc141" - } elseif ($OSVersion -eq "Windows 7 Enterprise") { - - if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - } else { - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - } - DownloadAndInstallSquish $version win32 "msvc141" + $winVersion = "win7" + $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" } +$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" + +Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Verify-Checksum "C:\Utils\$squishArchive" $sha1 +Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" +Rename-Item "$squishPackage" "$targetDir" + +Write-Host "Verifying Squish Installation for following targets:" +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName } +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } } From c4e49e746439de829c76c60168b1a14a5c214464 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 4 Jun 2020 11:33:43 +0300 Subject: [PATCH 31/44] Provisioning: Use signed opengl32 package Task-number: QTBUG-80252 Change-Id: Ife9942796ed64c4e2894fb3342259c674cf5d7ed Reviewed-by: Laszlo Agocs (cherry picked from commit 9c33fe844a2b9b1b601466740dd6097d649c1e0c) --- coin/provisioning/common/windows/mesa_llvmpipe.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 index ee792896..17684575 100644 --- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -34,12 +34,12 @@ $version = "11_2_2" $package = "C:\Windows\temp\opengl32sw.7z" -$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1" -$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z" -$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" -$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" -$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z" -$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglSha1_64 = "0ed35efbc8112282be5d0c87c37fde2d15e81998" +$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed.7z" +$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed.7z" +$mesaOpenglSha1_32 = "96bd6ca0d7fd249fb61531dca888965ffd20f53c" +$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed.7z" +$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed.7z" function Extract-Mesa { From a7654f4a033e732ab86c12eb925bb14a720471ac Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 22 May 2020 09:35:58 +0300 Subject: [PATCH 32/44] Provisioning: Change resolution for Windows 10 x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we have wrong resolution (1024x768) for 64-bit Windows. Correct one is 1280x800 Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f Reviewed-by: Tony Sarajärvi (cherry picked from commit fa58a227cd14d301d7d10b6dce85eace953fa211) Reviewed-by: Toni Saario --- .../01-change-resolution.ps1 | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 new file mode 100644 index 00000000..679769a8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 @@ -0,0 +1,25 @@ +$x_value = "1280" +$y_value = "800" + +Function ChangeResolution { + Param ( + [string]$driver + ) + + $path = "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration" + + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.bottom /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.right /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cx /T REG_dWORD /D $x_value /F + +} + +Write-Host "Changing the resolution to ${x_value}x${y_value}" +ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" +ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" +ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" From 30714c7cb7d6f6820c9abde676137ff63832fd04 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Jun 2020 10:48:51 +0300 Subject: [PATCH 33/44] Provisioning: Install Node.js Node.js is needed by QtWebengine Task-number: QTQAINFRA-3729 Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8 Reviewed-by: Toni Saario Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 122cf4cc0ea3433512d58937d483d42717892d51) --- coin/provisioning/common/windows/nodejs.ps1 | 61 +++++++++++++++++++ .../04-install-packages.sh | 2 + .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 3 + .../02-zypperpackages.sh | 3 +- .../qtci-macos-10.13-x86_64/30-nodejs.sh | 6 ++ .../qtci-macos-10.14-x86_64/30-nodejs.sh | 6 ++ .../qtci-windows-10-x86_64/03-nodejs.ps1 | 1 + 7 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/windows/nodejs.ps1 create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 diff --git a/coin/provisioning/common/windows/nodejs.ps1 b/coin/provisioning/common/windows/nodejs.ps1 new file mode 100644 index 00000000..c56f6db6 --- /dev/null +++ b/coin/provisioning/common/windows/nodejs.ps1 @@ -0,0 +1,61 @@ +############################################################################# +## +## Copyright (C) 2020 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 Node.js +# Needed by QtWebengine + +$version = "12.18.0" +$package = "C:\Windows\temp\nodejs-$version.zip" +$targetFolder = "C:\Utils\nodejs" +$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)" +$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip" + +if ( $arch -eq 64 ) { + $sha1 = "457b1527d249ee471a9445953a906cb10c75378d" +} else { + $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" + +} + +Write-Host "Installing Node.js" +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +mkdir $targetFolder +Extract-7Zip $package $targetFolder +Add-Path $targetFolder +Remove $package + +Write-Output "Node.js = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b3ecceea..c5304b21 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -80,6 +80,8 @@ installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) +installPackages+=(rh-nodejs12-nodejs) +installPackages+=(rh-nodejs12-nodejs-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum 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 639c82fd..ac35c278 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 @@ -84,6 +84,9 @@ installPackages+=(libudev-dev) installPackages+=(libegl1-mesa-dev) installPackages+=(libfontconfig1-dev) installPackages+=(libxss-dev) +installPackages+=(nodejs) +# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev. + # Common event loop handling installPackages+=(libglib2.0-dev) # MySQL support diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index d1f3050f..b509ff6c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -36,7 +36,7 @@ sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel + mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel @@ -49,3 +49,4 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel + diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 new file mode 100644 index 00000000..6032e945 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\nodejs.ps1" From 3bd4b2760eb68b528ab26b80f9eaa40a55803211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 20 Sep 2019 12:45:39 +0000 Subject: [PATCH 34/44] Update ICC 18 to ICC 19.1 Task-number: QTQAINFRA-3241 Change-Id: I9259a9f602e8cdec29720178331dd7b833e52f81 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 3 ++- .../qtci-linux-openSUSE-15.1-x86_64/18-icc.sh | 24 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 0aa4d97b..296fdf52 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -60,9 +60,10 @@ Configurations: Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-openSUSE-15.1-x86_64' - Compiler: 'ICC_18' + Compiler: 'ICC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Environment variables: ['LD_LIBRARY_PATH=$ICC64_19_LDLP:$LD_LIBRARY_PATH', 'PATH=$ICC64_19_PATH:$PATH' ] - Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh index 7ab8528a..2bf47639 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh @@ -43,12 +43,12 @@ set -ex mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2020_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc_2018.lic" +iccLicense="l_icc_2020.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -63,24 +63,26 @@ cp "$iccLicenseSource" "$iccLicenseTarget" sudo umount "$localMount" +{ serialNumber=$(cat $iccLicenseTarget | grep -e "SerialNumber" | awk -F '[=]' '{print $2}'); } 2>/dev/null + cat >"$iccInstallInstructions" <>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.1 20171018" >> ~/versions.txt +echo "export ICC64_19_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc +echo "export ICC64_19_PATH=$iccInstallPath/compilers_and_libraries_2020.1.217/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 19.1.1.217 20200306" >> ~/versions.txt rm -rf "$iccTmpPath" From 5be3dc5f60dff51c8045ceb946209e61cf79d9b0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 5 May 2020 08:28:51 +0300 Subject: [PATCH 35/44] Provisioning: Change mounting folder for Squish installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes some process is locking the mounted folder (/tmp) so that it can't be unmounted untill the process has been ended. Let's create squish folder under tmp and use that for mounting instead Task-number: QTQAINFRA-3709 Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c Reviewed-by: Dimitrios Apostolou Reviewed-by: Tony Sarajärvi (cherry picked from commit c671c2352e1db453da17d346316acfa627617786) Reviewed-by: Johanna Äijälä --- coin/provisioning/common/unix/squishInstall.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index a0c23350..7592814b 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -55,22 +55,21 @@ else sha1="63f33de55770e2588dd9f482546900e33d20f8ec" fi +mountFolder="/tmp/squish" +sudo mkdir "$mountFolder" + # Check which platform if uname -a |grep -q Darwin; then usersGroup="staff" - mountFolder="/Volumes" squishLicenseDir="/Users/qt" elif uname -a |grep -q "el7"; then usersGroup="qt" - mountFolder="/tmp" squishLicenseDir="/root" elif uname -a |grep -q "Ubuntu"; then usersGroup="users" - mountFolder="/tmp" squishLicenseDir="/home/qt" else usersGroup="users" - mountFolder="/tmp" squishLicenseDir="/root" fi From 95ac2d82ae2cdb7b7ea1157103dbf6d3b2ad376b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Jun 2020 23:46:22 +0200 Subject: [PATCH 36/44] Update submodules on '5.15' in qt/qt5 Change-Id: I1bc988ae72c7c6127740c5ecca9179e9108db200 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 83ee10ff..9541760e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 83ee10ff799fa5892b14a677036fb445ae16b10b +Subproject commit 9541760e42c4f879133e7b169957d309d98d3e59 diff --git a/qtbase b/qtbase index 4de8dd50..c6e42357 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4de8dd50d54f0cd5d83105a048d06d16fd89a878 +Subproject commit c6e42357721c5b621bbe177a55d0178e7709d116 diff --git a/qtconnectivity b/qtconnectivity index ac95e67f..2f464858 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ac95e67f071e7ee8fb1d65d1a4fe1b68ceee7c2d +Subproject commit 2f46485868a5d9f9a9035db7157864a3f5949a8a diff --git a/qtdeclarative b/qtdeclarative index 7064e09e..beea6c18 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7064e09e3a79f630356d8085c1bacae8ff5ff852 +Subproject commit beea6c18f0b6050e4d2633fba462f2b9b67ab134 diff --git a/qtdoc b/qtdoc index 086dcc8c..8006bf9f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 086dcc8c9d2f2f0631b62e983d190ddbb3c4b43d +Subproject commit 8006bf9f94cef92bc595195b0c192f15c9ab8439 diff --git a/qtmultimedia b/qtmultimedia index 603f1081..485eec95 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 603f108126e71e8a13011561b95f66f3deb69edc +Subproject commit 485eec9556d86c3428b47b9773ebe253d2a085cc diff --git a/qtqa b/qtqa index 354c7577..97c9a260 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 354c7577188cfffd417fd973b8611d84174eba85 +Subproject commit 97c9a2605cc91c3f0bd837d8283d0245d9ff0057 diff --git a/qtquick3d b/qtquick3d index 31122e51..be47be28 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 31122e51d3253bf6f3bebc57745f04a3c6941c80 +Subproject commit be47be28d0d6372cd2addedabee93ed05273b49e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0924bd35..79b0d9fc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0924bd35dce68adf5dc1fc0514f49a978bea2a45 +Subproject commit 79b0d9fcc02f2d2a8860bb4cc8a987a39fefda42 diff --git a/qtremoteobjects b/qtremoteobjects index be49da7e..0ef507f9 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit be49da7ec275e4fbbc678810bf7264197099eeee +Subproject commit 0ef507f9cad0f9355f470e129d3dd75c623bc882 diff --git a/qttools b/qttools index e1c5282d..d4342ab7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e1c5282d9f97bc2068107d4625933c7fefb9f0cc +Subproject commit d4342ab7e827960c417f9aa60340e8a56ff5a1c9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4cf279a5..a5442ee7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4cf279a5e6ad49720506a6825f008a773f5e951e +Subproject commit a5442ee7e44f8907635709269661d430b4141e37 diff --git a/qtwayland b/qtwayland index 5cba07a6..eaeb2128 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5cba07a66225d6ecedb1d9e952d272e236f30aa8 +Subproject commit eaeb21284ab7a3714c735ee8d7c348aa3bc3a07a diff --git a/qtwebengine b/qtwebengine index 29a687c1..2c956efe 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 29a687c1743dbb0ba42bab08e751755eec3454a8 +Subproject commit 2c956efefd5cddf7eca606e15aee70c2dcd192eb From da578e2b17aa703489e0229482626b7756bc4583 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Jun 2020 23:46:20 +0200 Subject: [PATCH 37/44] Update submodules on '5.15' in qt/qt5 Change-Id: I276a28fe36ae88d770bd8385810a17149ac7f6ee Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 9541760e..56002319 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9541760e42c4f879133e7b169957d309d98d3e59 +Subproject commit 5600231953e7e68965d66617509c0513bef7a2ca diff --git a/qtbase b/qtbase index c6e42357..8f088c9f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c6e42357721c5b621bbe177a55d0178e7709d116 +Subproject commit 8f088c9f82f7db089f62add74e1fe2ac8da55cd3 diff --git a/qtdeclarative b/qtdeclarative index beea6c18..d2471eb3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit beea6c18f0b6050e4d2633fba462f2b9b67ab134 +Subproject commit d2471eb3ece7fee58dcb8819cc0ce953da832006 diff --git a/qtdoc b/qtdoc index 8006bf9f..fc94e5c5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8006bf9f94cef92bc595195b0c192f15c9ab8439 +Subproject commit fc94e5c5cfab13aeae8609c55dcf2c883533ef3d diff --git a/qtmultimedia b/qtmultimedia index 485eec95..8337692e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 485eec9556d86c3428b47b9773ebe253d2a085cc +Subproject commit 8337692ea357da48e8914e6ab87d6cb6baf17dc7 diff --git a/qtqa b/qtqa index 97c9a260..bb747f61 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 97c9a2605cc91c3f0bd837d8283d0245d9ff0057 +Subproject commit bb747f61a7a572d08e2b3936a1aa2e15b1765de9 diff --git a/qtquick3d b/qtquick3d index be47be28..9b63966e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit be47be28d0d6372cd2addedabee93ed05273b49e +Subproject commit 9b63966e942f8c0e070e0dc4d7078d49b95d67f8 diff --git a/qtwebengine b/qtwebengine index 2c956efe..6bae6dcf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2c956efefd5cddf7eca606e15aee70c2dcd192eb +Subproject commit 6bae6dcf10d33b2986a022e4327fe4e8b76b5111 From ac489d92a3ae32540c4794d85be6fb103c701ee8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Jun 2020 23:46:44 +0200 Subject: [PATCH 38/44] Update submodules on '5.15' in qt/qt5 Change-Id: I2c3da4ef65c9a669a54ada33c2760f541585fd8d Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qttranslations | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 56002319..a3453480 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5600231953e7e68965d66617509c0513bef7a2ca +Subproject commit a3453480c4247028c38f75c0775d9ff4f21ce1bb diff --git a/qtbase b/qtbase index 8f088c9f..bde6b278 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8f088c9f82f7db089f62add74e1fe2ac8da55cd3 +Subproject commit bde6b27882143acbafa8c0b2e8055c3808ae3dd4 diff --git a/qtconnectivity b/qtconnectivity index 2f464858..be75143e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2f46485868a5d9f9a9035db7157864a3f5949a8a +Subproject commit be75143e7d6d74bf49284746afcbe26c8091f471 diff --git a/qtdeclarative b/qtdeclarative index d2471eb3..d1b1fa52 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d2471eb3ece7fee58dcb8819cc0ce953da832006 +Subproject commit d1b1fa52a2fded9691f6be5ee864b30adab0db2b diff --git a/qtquick3d b/qtquick3d index 9b63966e..446a8940 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9b63966e942f8c0e070e0dc4d7078d49b95d67f8 +Subproject commit 446a8940fb8c71f0e9aeaeebb282483f14d0e64e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 79b0d9fc..428cce1a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 79b0d9fcc02f2d2a8860bb4cc8a987a39fefda42 +Subproject commit 428cce1a9494eca8683ab8f2181a60588f8c9a39 diff --git a/qttranslations b/qttranslations index 132bdb78..ae7c48d0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 132bdb78342692f6f0ad2a6c703d9a67dc0227f0 +Subproject commit ae7c48d0547391b6a247e3365f084292e8af6ec9 From de3cffca0491d972b49fac96a9cbe2b427aeee16 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Jun 2020 23:46:20 +0200 Subject: [PATCH 39/44] Update submodules on '5.15' in qt/qt5 Change-Id: Ia61caaf7838df31baa1ed53abce2de3f4d514b05 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index a3453480..5f83aa91 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a3453480c4247028c38f75c0775d9ff4f21ce1bb +Subproject commit 5f83aa911364925d93c552c4bbea885a4e2807ee diff --git a/qtbase b/qtbase index bde6b278..146374cc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bde6b27882143acbafa8c0b2e8055c3808ae3dd4 +Subproject commit 146374ccec4975a0fecf6d22e2bbe7014e6a60e3 diff --git a/qtdoc b/qtdoc index fc94e5c5..64a0b3a3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fc94e5c5cfab13aeae8609c55dcf2c883533ef3d +Subproject commit 64a0b3a31ab1080bd6183594588330a51cf4ad58 diff --git a/qtqa b/qtqa index bb747f61..36a71f6d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bb747f61a7a572d08e2b3936a1aa2e15b1765de9 +Subproject commit 36a71f6d34c695e04c9d7b1eb829effcda0dce34 diff --git a/qtquick3d b/qtquick3d index 446a8940..e133dec4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 446a8940fb8c71f0e9aeaeebb282483f14d0e64e +Subproject commit e133dec4278ce34b68617e4ec7bbbdb841e60904 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 428cce1a..f66d6116 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 428cce1a9494eca8683ab8f2181a60588f8c9a39 +Subproject commit f66d6116b0fb84982b004e282bea9bfcfbc1f950 diff --git a/qtsvg b/qtsvg index c2d3f283..d952a1cd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit c2d3f2833a3480d1254233a1c2a567b4e6b8bfdd +Subproject commit d952a1cddd75cafd0fad2c897bc7d3b7ad77a2c4 From 1095b1abc6d233bc27321f46f71bbd85fe8556de Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Jun 2020 23:46:28 +0200 Subject: [PATCH 40/44] Update submodules on '5.15' in qt/qt5 Change-Id: I136877d3881f9288086f4ef34a8768ca4333adf3 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtremoteobjects | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 146374cc..dbcee395 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 146374ccec4975a0fecf6d22e2bbe7014e6a60e3 +Subproject commit dbcee395e5cf54c0c0f961a80c4e9959d564604d diff --git a/qtdeclarative b/qtdeclarative index d1b1fa52..1a7457e0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d1b1fa52a2fded9691f6be5ee864b30adab0db2b +Subproject commit 1a7457e03381e217f1242bce49b86cd0e06bd65f diff --git a/qtremoteobjects b/qtremoteobjects index 0ef507f9..d4957cd7 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0ef507f9cad0f9355f470e129d3dd75c623bc882 +Subproject commit d4957cd786ac95337abf9a66e93dbce08c1a9f92 diff --git a/qtwebengine b/qtwebengine index 6bae6dcf..027cce27 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6bae6dcf10d33b2986a022e4327fe4e8b76b5111 +Subproject commit 027cce270aea504308e123988dfb5cd1658687d7 From bc437dd773beeb201dfeacd6b99ddd69991387ec Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 20 Jun 2020 23:47:26 +0200 Subject: [PATCH 41/44] Update submodules on '5.15' in qt/qt5 Change-Id: Ic137eafef1116252f2ed4317463713b9bdfd9d67 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index dbcee395..d29fa6b1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dbcee395e5cf54c0c0f961a80c4e9959d564604d +Subproject commit d29fa6b14f1d7e947cf86ffd215d43c8bb1bda99 From cd021169a138147b4dec978d6c9163d00e6ecd08 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Jun 2020 23:46:20 +0200 Subject: [PATCH 42/44] Update submodules on '5.15' in qt/qt5 Change-Id: I23e14120044d3d165bdd6fb516b207471c090faf Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtsvg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index d29fa6b1..de6e92e2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d29fa6b14f1d7e947cf86ffd215d43c8bb1bda99 +Subproject commit de6e92e26a49de4942f006c2e70f11d1dbf600d6 diff --git a/qtdeclarative b/qtdeclarative index 1a7457e0..ad47d70e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1a7457e03381e217f1242bce49b86cd0e06bd65f +Subproject commit ad47d70e2289d59625cd405fa54c5de2db68ad82 diff --git a/qtsvg b/qtsvg index d952a1cd..d439739e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d952a1cddd75cafd0fad2c897bc7d3b7ad77a2c4 +Subproject commit d439739e15c100f257a1a1842770c4282dc9666e From 75ae2c8579fa4ebe713a858c2e9dca1996f3b8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 26 Jun 2020 09:51:16 +0000 Subject: [PATCH 43/44] Disable LSO from the network adapters on Windows Disabling LSO from the adapter gives us huge performance boosts on Windows. In our tests 2 VMs within the same hosts had transfer speeds of 30 Mbit/s with this enabled, and 2Gbit/s with this disabled. Change-Id: Id794e7559c9e9005043361289a3db246a8528dd4 Reviewed-by: Heikki Halmet (cherry picked from commit 97aa7a0031cc681915aa2f56545a175f8b4d112d) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/disable-netadapterlso.ps1 | 1 + .../qtci-windows-10-x86/00-disable-netadapterlso.ps1 | 1 + .../qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 | 1 + .../qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 | 1 + .../qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 | 1 + 5 files changed, 5 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 new file mode 100644 index 00000000..ca7ad3ca --- /dev/null +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -0,0 +1 @@ +Disable-NetAdapterLso Ethernet diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" From 7143d018dc7f1cbe5b7bd3d5fb5a8dd50fe71589 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 22 Jun 2020 09:43:37 +0300 Subject: [PATCH 44/44] Provisioning: Update OpenSSL to version 1.1.1g MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3819 Change-Id: Ie7d0f3a0c73d123c3f3536e6b2dd2eb8608eb9cd (cherry picked from commit 2ac3dd2d6ff8acf8348ac8607160ab972de66325) Reviewed-by: Tony Sarajärvi --- .../common/linux/openssl_for_android_linux.sh | 6 +++--- coin/provisioning/common/unix/install-openssl.sh | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 6 +++--- coin/provisioning/common/windows/openssl.ps1 | 8 ++++---- coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 4860c01f..65e3b022 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -53,11 +53,11 @@ else rm -rf "$exports_file" fi -version="1.1.1d" +version="1.1.1g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="056057782325134b76d1931c48f2c7e6595d7ef4" +sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 08a3390b..75b7edbc 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1d" +version="1.1.1g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="056057782325134b76d1931c48f2c7e6595d7ef4" +sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d1877b64..010e7e76 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -45,9 +45,9 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1d" +$version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" +$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" $destination = "C:\Utils\openssl-android-master" # msys unix style paths diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 891f5db7..08f7d60f 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 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 OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1d" +$version = "1_1_1g" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "df9c40e9e82edf693c15302cbc8e8a057857a13c" + $sha1 = "7643561c372720f55de51454a707ede334db086e" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0" +$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index 269771c7..717e06fc 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,9 +43,9 @@ # nmake install -$version = "1.1.1d" +$version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$sha1 = "e94263ba067a5cc0ace17e26bb2f98c62d298b5a" $url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip