From ff2c96f48345a132106f276069ea0d9e2d21e377 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 22 Oct 2018 15:52:09 +0200 Subject: [PATCH 01/56] Adjust submodule branches Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1c21bce2..31bb5338 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.0 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.0 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.0 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.0 status = preview From 01faa84629cfbbbe4c5bbb457d31bad50dc7883c Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 29 Oct 2018 15:22:02 +0200 Subject: [PATCH 02/56] Update qt3d-runtime.txt targets Add missing macOS and Windows Android arm64 targets. Remove iOS target that is now included in default.txt. Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190 Reviewed-by: Akseli Salovaara Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 6abc5ed2..37065eff 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -9,11 +9,12 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 From c1376f91df0ab1a4af8f8864d3d08c750dd8f75f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 31 Oct 2018 13:42:52 +0100 Subject: [PATCH 03/56] Update submodules on '5.12.0' in qt5 Change-Id: I2dc837b9d8e75176c5ecd3c42e17892676c1f65d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index 3d75a66c..6a764d21 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3d75a66c2908faa39d25b55f3d4b8ff3d0c5c4b7 +Subproject commit 6a764d2164a64d490d63775111321d4d6bda7377 diff --git a/qtbase b/qtbase index c6c31b14..5f3518d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c6c31b14a73674459eb5e762bb7487900b8c4b36 +Subproject commit 5f3518d0bfbf5018d2a56c4157cd1163be5489b5 diff --git a/qtdatavis3d b/qtdatavis3d index 12d9593d..1ad75d11 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 12d9593daeb8ffc7e50d068923afaf848083dcd4 +Subproject commit 1ad75d1169764b599bd5fe6d1a3d9c1745e9f5cc diff --git a/qtdeclarative b/qtdeclarative index 6734ee9a..3a614b1c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6734ee9a6ddb6a3870556514a70d904836258559 +Subproject commit 3a614b1c2e78de04b32a957414f5a8d4dd0e07b1 diff --git a/qtdoc b/qtdoc index e8422196..d079900f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e8422196ce16a0a9abdb2b342f9caeb8ef7a6149 +Subproject commit d079900f11f83d1bda8ec52902716d7ebb02310b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 314a2b53..2f502d9e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 314a2b53a885a41f0a220fdcd5e8cd4592078b29 +Subproject commit 2f502d9e123aabc930991cb5d3b04a2542df8612 diff --git a/qtimageformats b/qtimageformats index 4783c6dc..a9be081d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4783c6dc4441ab833050a08996d40d959960ecff +Subproject commit a9be081dacbd307eb277ef1fe6c095677e00248f diff --git a/qtlocation b/qtlocation index 0cdf4748..eb3143f2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0cdf4748dd40ec2e0df20eda4a63e8e070d2b790 +Subproject commit eb3143f22ca1642056d821b73af493cdab59dd85 diff --git a/qtquickcontrols b/qtquickcontrols index c345d1dd..5db6659d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c345d1ddf66fa73660a299826b9e3a3328519bed +Subproject commit 5db6659d65062353cfa6425f7790ea34f1b4a3f4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2876332a..1abdfe5d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2876332ad911b3c0402006ca9116af66cecdb8eb +Subproject commit 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56 diff --git a/qtremoteobjects b/qtremoteobjects index 09a6746e..88673b33 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 09a6746ec6d2a21415f8e0b0a8817510f1b8b2e9 +Subproject commit 88673b336fd52c026134d1e348d12c310c48b1ac diff --git a/qtserialbus b/qtserialbus index 43a65b66..834258bb 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 43a65b661f54755eb725e25112d62cb5eb726ac3 +Subproject commit 834258bb3d17638e8e3dc2eca2a3115006c092fd diff --git a/qtspeech b/qtspeech index f12d6721..f929c8d9 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f12d6721415877c4f2606c70d11e2474d6a515ec +Subproject commit f929c8d9c63bdef5a196cf44776ac89f555f21db diff --git a/qttools b/qttools index 54e8925e..767f783d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 54e8925e0997bb4606e4b5491d2d8e446db401ce +Subproject commit 767f783d65fdd8d154167966b75525c73036e27e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8f881666..58ec88e7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8f8816668694c6eeba5ccf017d94c14dad946f02 +Subproject commit 58ec88e7b33027047a4d5dd82a84fca3a96be40c diff --git a/qtwayland b/qtwayland index 4a328e35..52876056 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4a328e3533f93ed65f9dc77f764b3cbe3c694266 +Subproject commit 52876056ff3dcda97f93932bc8c6e1c0fbce9d5e diff --git a/qtwebengine b/qtwebengine index e77ed6f1..8eda96bc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e77ed6f1686dab1852106d2ffa5f74e7526dbce9 +Subproject commit 8eda96bc8ae68387807e079cd557c98c4a452c4f diff --git a/qtwebglplugin b/qtwebglplugin index e14f4569..c320888f 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e14f45692d5a0ffc15bfd3b85e4fd31d7e578d31 +Subproject commit c320888ff64d81e5e291eb5db683b000b9fe59a8 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7df00373..e08f9393 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7df0037316cc2efa7ac082231b72a3fe5dcdfe8f +Subproject commit e08f9393acc6417598f328d7f4b7b082c5d57afa From 3bb63c22c4d79c7f12ba9c65b20be7a9a04c223c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 2 Nov 2018 15:29:23 +0100 Subject: [PATCH 04/56] Adjust submodule branches Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9ac0ec9c..c2c9e5e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.11 + branch = 5.11.3 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.11 + branch = 5.11.3 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.11 + branch = 5.11.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,77 +121,77 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.11 + branch = 5.11.3 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -204,108 +204,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.11 + branch = 5.11.3 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.11 + branch = 5.11.3 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.11 + branch = 5.11.3 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.11 + branch = 5.11.3 status = preview From 9a9f35850828f7448e293a10d1d4210a9f5f59d2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 1 Nov 2018 12:00:30 +0100 Subject: [PATCH 05/56] Graduate qtremoteobjects and qtwebglplugin Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26 Reviewed-by: Venugopal Shivashankar Reviewed-by: Jani Heikkinen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 31bb5338..f48b0965 100644 --- a/.gitmodules +++ b/.gitmodules @@ -297,11 +297,11 @@ path = qtremoteobjects url = ../qtremoteobjects.git branch = 5.12.0 - status = preview + status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git branch = 5.12.0 - status = preview + status = addon From e4707bcdffc95917905080060af5a53b1737e151 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Nov 2018 19:09:28 +0100 Subject: [PATCH 06/56] Update submodules on '5.12.0' in qt5 Change-Id: Ic6ce42f23f2e567e79d69180b986ae25e97ea1c7 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qtbase b/qtbase index 5f3518d0..d24835a6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5f3518d0bfbf5018d2a56c4157cd1163be5489b5 +Subproject commit d24835a60c0c620a27c7a9830b89ed47312739a5 diff --git a/qtcharts b/qtcharts index bd9f0b27..0d02273f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit bd9f0b27169dcbc3f8bb3914d3e21b1daddeeee5 +Subproject commit 0d02273f948243e799dc00e84134679a8b1ac652 diff --git a/qtconnectivity b/qtconnectivity index 26840646..c2b51090 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 26840646bb0e1b82bb6608395ba6041538ced3ab +Subproject commit c2b510909dc8839ff6578086051a22e8b21462e3 diff --git a/qtdatavis3d b/qtdatavis3d index 1ad75d11..5aaaab84 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 1ad75d1169764b599bd5fe6d1a3d9c1745e9f5cc +Subproject commit 5aaaab846165c3ceb07a75207884d9b63f8feb56 diff --git a/qtdeclarative b/qtdeclarative index 3a614b1c..0477a057 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3a614b1c2e78de04b32a957414f5a8d4dd0e07b1 +Subproject commit 0477a057fd02050fd330760bf046f5e0e91a9331 diff --git a/qtdoc b/qtdoc index d079900f..8e4303a2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d079900f11f83d1bda8ec52902716d7ebb02310b +Subproject commit 8e4303a22ed73efb129bf2de818081463e546535 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2f502d9e..443141d5 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2f502d9e123aabc930991cb5d3b04a2542df8612 +Subproject commit 443141d5d87a6a94867466d927f3ffedf2f6fbdf diff --git a/qtimageformats b/qtimageformats index a9be081d..8bd2d545 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a9be081dacbd307eb277ef1fe6c095677e00248f +Subproject commit 8bd2d545fd08420a52e4b99c8d71be64b8ec338e diff --git a/qtlocation b/qtlocation index eb3143f2..563f6eb6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eb3143f22ca1642056d821b73af493cdab59dd85 +Subproject commit 563f6eb62fc614d435bf29337e182d82131b5b87 diff --git a/qtmacextras b/qtmacextras index b8b7809d..6eca1416 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit b8b7809d2a08c190f493393119626c53da13094a +Subproject commit 6eca14163e89c558cbbf3793751f787e88494e4f diff --git a/qtmultimedia b/qtmultimedia index 30cbbd98..471d8fd0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 30cbbd98e7159de08bb71ab4332dbd0bab19eba5 +Subproject commit 471d8fd0826c09bbff3b19e477fadad4f5b55ed0 diff --git a/qtpurchasing b/qtpurchasing index 21927fdb..4205be43 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 21927fdbdbe4d928d909b0a9e7992ed9bc817716 +Subproject commit 4205be438a93457c2441230e2b28a8adaed00661 diff --git a/qtquickcontrols b/qtquickcontrols index 5db6659d..6356a11e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5db6659d65062353cfa6425f7790ea34f1b4a3f4 +Subproject commit 6356a11e07cbda92b3aa78732b34375cd6c9436e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1abdfe5d..936d3117 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56 +Subproject commit 936d31179d44220571ded15840bedeccb581c83b diff --git a/qtrepotools b/qtrepotools index ddd8ad86..4712e59d 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ddd8ad86da7790ce83640814ee5f1528c4df1fbe +Subproject commit 4712e59d75bb95cb206aff4a6bc111c7c79b06a5 diff --git a/qtserialbus b/qtserialbus index 834258bb..54262ed8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 834258bb3d17638e8e3dc2eca2a3115006c092fd +Subproject commit 54262ed8861dcf7ea15f89591c07b414b74c85f0 diff --git a/qtserialport b/qtserialport index a61ed3bc..ac1d4ea2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a61ed3bce7df1ec56712d874e23a7ec95ad141ab +Subproject commit ac1d4ea2b9e5b1ca2efdbae4629e53dbf8cc9257 diff --git a/qtspeech b/qtspeech index f929c8d9..28855fc3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f929c8d9c63bdef5a196cf44776ac89f555f21db +Subproject commit 28855fc361c4d5ef920f020509a980dd45eb1ba8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 58ec88e7..afcc82a9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 58ec88e7b33027047a4d5dd82a84fca3a96be40c +Subproject commit afcc82a95baa2e6145836cadcf25a2e544e0b0e1 diff --git a/qtwayland b/qtwayland index 52876056..7451faab 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 52876056ff3dcda97f93932bc8c6e1c0fbce9d5e +Subproject commit 7451faab740ec6294159be60d8a713f5e8070c09 diff --git a/qtwebview b/qtwebview index eea4b92d..452f14f4 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit eea4b92dbb1c333f073e6ad7f146957ac95624aa +Subproject commit 452f14f48075a19fd67060a8581268e81bf16d0e diff --git a/qtwinextras b/qtwinextras index 5e04d2d9..f73ea671 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5e04d2d9d983a4304deafa439cd0b6b0107dc5d1 +Subproject commit f73ea671c28979d53851255b5a6c5a46b205847d diff --git a/qtx11extras b/qtx11extras index 2326dcdf..41906c62 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 2326dcdf30772c7a73136b5537c02128884579a0 +Subproject commit 41906c62bdd5f50016266b2b56dea43eb0d47983 diff --git a/qtxmlpatterns b/qtxmlpatterns index e08f9393..803b4caf 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e08f9393acc6417598f328d7f4b7b082c5d57afa +Subproject commit 803b4cafe125ea18e50e3e6557920b6d705e67f0 From 417d293fa73b34c4004017d2d7aa19c6a292acde Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 30 Oct 2018 16:14:32 +0100 Subject: [PATCH 07/56] Add 'qttools' dependency for WebEngine QtTools module is required for designer plugin. Fixes: QTBUG-71404 Change-Id: I081740679dace196b9ff42d98bddd941848738f8 Reviewed-by: Friedemann Kleint Reviewed-by: Iikka Eklund Reviewed-by: Oswald Buddenhagen --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f48b0965..57f4bfd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -211,7 +211,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel + recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = 5.12.0 From 6d6e00093282bad1dddc4faf8bcf49cbb5abe596 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Nov 2018 11:23:36 +0100 Subject: [PATCH 08/56] Update submodules on '5.12.0' in qt5 Change-Id: I41d60616e029d96bb6580345a59ff906ded608d5 Reviewed-by: Liang Qi --- qtdoc | 2 +- qtremoteobjects | 2 +- qtwayland | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdoc b/qtdoc index 8e4303a2..9e300970 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8e4303a22ed73efb129bf2de818081463e546535 +Subproject commit 9e30097015a9ca87c41cb7a8697f2918ffbe8b69 diff --git a/qtremoteobjects b/qtremoteobjects index 88673b33..040b2aa6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 88673b336fd52c026134d1e348d12c310c48b1ac +Subproject commit 040b2aa6c117ec05320ebb07ce4f014dc66655d5 diff --git a/qtwayland b/qtwayland index 7451faab..62137386 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7451faab740ec6294159be60d8a713f5e8070c09 +Subproject commit 62137386928f14228db2d10033d9b80875113e33 From 092b611d80025476e1ef6c4e3ca69d814908d7d5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Nov 2018 21:53:23 +0100 Subject: [PATCH 09/56] Update submodules on '5.12.0' in qt5 Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 6a764d21..b212e7a5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6a764d2164a64d490d63775111321d4d6bda7377 +Subproject commit b212e7a540ee3988964eb3612ad96c6687561cbc diff --git a/qtbase b/qtbase index d24835a6..ac4d954c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d24835a60c0c620a27c7a9830b89ed47312739a5 +Subproject commit ac4d954cfba98b1a6abb5c8cabed6ee32a43560c diff --git a/qtdeclarative b/qtdeclarative index 0477a057..53440d68 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0477a057fd02050fd330760bf046f5e0e91a9331 +Subproject commit 53440d6844a712e6675e084ada8a196ed6555aa1 diff --git a/qtserialbus b/qtserialbus index 54262ed8..f5bcd1bc 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 54262ed8861dcf7ea15f89591c07b414b74c85f0 +Subproject commit f5bcd1bc921f533cb3bd5d3a03c828d2554cf8a5 diff --git a/qtsvg b/qtsvg index 588dbd7a..f0fe78d1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 588dbd7a680538d7880fdd5259a3c12a88338a85 +Subproject commit f0fe78d1affb024db6e71172b3a2107ee5b8de20 diff --git a/qttools b/qttools index 767f783d..a55cf07c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 767f783d65fdd8d154167966b75525c73036e27e +Subproject commit a55cf07c63a1440b35075480fc2960161dfb60d9 diff --git a/qtwebengine b/qtwebengine index 8eda96bc..31663075 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8eda96bc8ae68387807e079cd557c98c4a452c4f +Subproject commit 31663075ff5fbf49feca99756c2808daaf4e3174 From 829447d340788ad96b12be3b7446d0ff74c56c66 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Nov 2018 05:56:10 +0000 Subject: [PATCH 10/56] Update submodules on '5.12.0' in qt5 Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qt3d b/qt3d index b212e7a5..3e799636 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b212e7a540ee3988964eb3612ad96c6687561cbc +Subproject commit 3e799636b24fa9cb8528ba597d74fa52094cfaa1 diff --git a/qtactiveqt b/qtactiveqt index 371c0e83..92b453c7 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 371c0e8389cebc5bd4e9726c31596ad3b56b33fc +Subproject commit 92b453c705c3259e03913002e5ab34d599647852 diff --git a/qtandroidextras b/qtandroidextras index b2e2e76b..a987d9fd 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b2e2e76b1e96df5086158d7367ca91a8f2c4614e +Subproject commit a987d9fd395bc0b99faa4a9c321d03981758d804 diff --git a/qtbase b/qtbase index ac4d954c..35069301 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ac4d954cfba98b1a6abb5c8cabed6ee32a43560c +Subproject commit 35069301f048eed21a27f89b6495d56c44f2b55d diff --git a/qtcanvas3d b/qtcanvas3d index 8e097e44..124800ae 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 8e097e44aa457efcdb1a0b1ff00d8e794c3a8a18 +Subproject commit 124800ae8b5932ef4eb35fd9f76f78c38428dc22 diff --git a/qtconnectivity b/qtconnectivity index c2b51090..79b00752 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c2b510909dc8839ff6578086051a22e8b21462e3 +Subproject commit 79b00752193d0c8f23260f64d47a6cb071a1cde3 diff --git a/qtdeclarative b/qtdeclarative index 53440d68..7748d3ca 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 53440d6844a712e6675e084ada8a196ed6555aa1 +Subproject commit 7748d3ca4671edf3b99fcbe7e35f23a747bba191 diff --git a/qtdoc b/qtdoc index 9e300970..2e882015 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9e30097015a9ca87c41cb7a8697f2918ffbe8b69 +Subproject commit 2e882015c11a4730da01692c5d650f43ad44c0fe diff --git a/qtgamepad b/qtgamepad index 7da78510..2d93e66a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 7da78510f828a02c7a9be70c9f3a37da53521554 +Subproject commit 2d93e66a5ca70b475f3a02fba1502a12f8638391 diff --git a/qtlocation b/qtlocation index 563f6eb6..f777e851 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 563f6eb62fc614d435bf29337e182d82131b5b87 +Subproject commit f777e851f5992a3b813e0d0c68f947c2a2f764fa diff --git a/qtnetworkauth b/qtnetworkauth index 0930d394..f3ed24cc 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 0930d394d7e2aa51499fc4f735556c97da85afe8 +Subproject commit f3ed24cc4b9a47e6e501b94ab665841d196e614c diff --git a/qtremoteobjects b/qtremoteobjects index 040b2aa6..4b0abba2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 040b2aa6c117ec05320ebb07ce4f014dc66655d5 +Subproject commit 4b0abba261c87c39e4ce64895b188f6c29fe38a0 diff --git a/qtscxml b/qtscxml index d5396ed0..1a05d2a3 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d5396ed00589374aed8e44f8f2e3217a3fb768df +Subproject commit 1a05d2a375020bb30c9dc02f8ece93ee8becec2e diff --git a/qtsensors b/qtsensors index 76f3abf8..cb7da3a1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 76f3abf8e03344a73e32d1324cd7e6751b4039de +Subproject commit cb7da3a16f233e17ef6ed57a682845cd07188771 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index afcc82a9..d6ca2af5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit afcc82a95baa2e6145836cadcf25a2e544e0b0e1 +Subproject commit d6ca2af52b8ee363ae02f111cbc57ebb427754d8 diff --git a/qtwayland b/qtwayland index 62137386..f8907980 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 62137386928f14228db2d10033d9b80875113e33 +Subproject commit f890798053c7fa692bff7f8a3e96583dfcaba0cb diff --git a/qtwebchannel b/qtwebchannel index 7ab88507..b06cbe37 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7ab88507fbd43cc51c2600c1656ed32d56d3703a +Subproject commit b06cbe376633e897940a19d94a6f672b1e16a85a diff --git a/qtwebengine b/qtwebengine index 31663075..ce0335c0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 31663075ff5fbf49feca99756c2808daaf4e3174 +Subproject commit ce0335c0b6c892bfdb06cd52830a705aa6d71d9b diff --git a/qtwebglplugin b/qtwebglplugin index c320888f..41d5d2c7 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit c320888ff64d81e5e291eb5db683b000b9fe59a8 +Subproject commit 41d5d2c7ba79c435b59af924d5b360f78dce01e4 diff --git a/qtwebsockets b/qtwebsockets index 247373d6..b148fb81 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 247373d6501bab94ce1ea0048e390bd910963db9 +Subproject commit b148fb8181deb3d0c68d24bc28b3e6c4b19a6089 From c17352fc1280bdd420664223c6a944f025b1e481 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Nov 2018 13:40:39 +0100 Subject: [PATCH 11/56] Update submodules on '5.11.3' in qt5 Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index 33146940..d4835713 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3314694004b825263c9b9f2d69bd85da806ccbbc +Subproject commit d4835713b808503ab6d3039f3893355804a8a21d diff --git a/qtactiveqt b/qtactiveqt index 52637083..4cfbe403 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 52637083eeaa1ab4b9468813a28d40feea81ab5e +Subproject commit 4cfbe4037ee8f5b1cd96be516cc00c3dbf43c59d diff --git a/qtandroidextras b/qtandroidextras index f7df383a..16d33f91 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f7df383a284e2189f0137efd9d9496f2be79566b +Subproject commit 16d33f91eadadc63e4a999fb175ed67b3321e9b7 diff --git a/qtbase b/qtbase index c9d18d4a..c69f4359 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c9d18d4a9c9d1243a267316e2a702f9ba69de2fd +Subproject commit c69f43594fc921fea82377e7b31a7f55f718051d diff --git a/qtcanvas3d b/qtcanvas3d index 96a47ce9..6f0a1143 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 96a47ce9de9e61ca92561160bc6d586c156094d2 +Subproject commit 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 diff --git a/qtcharts b/qtcharts index b90ea4a9..1bf73796 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b90ea4a947a5fe808cba8a12e3c9e9864ffdaa20 +Subproject commit 1bf73796a92ccd1599e5c762b73a76e545e48262 diff --git a/qtconnectivity b/qtconnectivity index 5f30c774..d1cf8dad 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5f30c77484a9af223d32067f579d440010520eb2 +Subproject commit d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a diff --git a/qtdatavis3d b/qtdatavis3d index 191ef6d8..7b091d13 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 191ef6d87362a5285d34ece4c48655408b2daa12 +Subproject commit 7b091d13ed5509a73da921a7ed30034a7eb55131 diff --git a/qtdeclarative b/qtdeclarative index 4a886753..7eaa9368 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4a886753a75c7c4d66f1fa9cab5a6c5a03240df3 +Subproject commit 7eaa93680ce583354f23f3b29bd6db59169dfece diff --git a/qtdoc b/qtdoc index c6e73db4..44be9a77 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c6e73db4f577f2076e6ad4b542f7dab08b744659 +Subproject commit 44be9a776a6efd29fb58b41478eb92bc33dfc1f5 diff --git a/qtgamepad b/qtgamepad index e3b436f6..e542b1b6 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e3b436f6718e666f4c5baa3b768993382809e1ed +Subproject commit e542b1b6c46e49baec66d427a2664cc2c6aefa01 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 965da52a..7e2544e2 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 965da52a583a27fc41a489a4141f78c3acb0d143 +Subproject commit 7e2544e28cac2fbf7176b6692dacc57096774249 diff --git a/qtimageformats b/qtimageformats index 8455ab6c..2f61f401 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8455ab6cb29fcccf44977c517689a8ad26781140 +Subproject commit 2f61f401187d55bb0304591f27792a63a38db00e diff --git a/qtlocation b/qtlocation index 6b109d09..25c6840f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6b109d09982e09940dc8e777430a04410d7b6550 +Subproject commit 25c6840ff6585ca9f7ab1c168cdcdd18a68c7885 diff --git a/qtmacextras b/qtmacextras index 19e8855c..4b318dbb 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 19e8855c9a47753313aa361b202a36703401fce1 +Subproject commit 4b318dbbb95f4ca60782846ec4b59422953900e7 diff --git a/qtmultimedia b/qtmultimedia index fc33195f..d9bf5685 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fc33195f87d7b2b036f1df625a8fda12557e05e4 +Subproject commit d9bf568551c9e101374ba842e831650d34d0d41e diff --git a/qtnetworkauth b/qtnetworkauth index f76f07ee..ffb63277 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f76f07ee7328b8d402bf0b12aa99023b8955d4ed +Subproject commit ffb63277ac2ac90b4a99a710660d5e66920a8c5a diff --git a/qtpurchasing b/qtpurchasing index e5ae8515..d7257f75 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e5ae8515422fd0cc7cf9aa91c8b0c38fa53fd9a9 +Subproject commit d7257f75e1e9f89a2934c50784d76d90f919605f diff --git a/qtquickcontrols b/qtquickcontrols index d7611760..cf957e40 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d76117604a9e04a9a66c0279687cc7dc54b9dc68 +Subproject commit cf957e407030fc260bd86882cf2f79724126abdd diff --git a/qtremoteobjects b/qtremoteobjects index a0263f7a..9fcf2a90 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a0263f7a09bd5b9c0d2d0f37f3037293c0a6f921 +Subproject commit 9fcf2a90db6d6dce1fe03a2f7af4c4a148c35087 diff --git a/qtscript b/qtscript index eb287106..ebe11c8e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit eb28710655e4cf1059ec450527061d777fcb867e +Subproject commit ebe11c8e867bb65ad7cb1424fe4c096935741089 diff --git a/qtscxml b/qtscxml index 4f6797ac..a5effbcb 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4f6797ac018f931f3655a53ca5d4ca0114f321e0 +Subproject commit a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 diff --git a/qtsensors b/qtsensors index 58854bdb..a4c3631b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 58854bdb19cfff1c66788a3035f2aa12b34cce00 +Subproject commit a4c3631b0bb895b854305ecf2a4632dc949ef2d3 diff --git a/qtserialbus b/qtserialbus index 864e4a8a..200822ca 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 864e4a8ab514ddcd7f79106a6b447f7a1d5b5d4e +Subproject commit 200822ca61732693cc97802b953cd846654eb319 diff --git a/qtserialport b/qtserialport index 3f028584..74222a0e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3f0285847230151026890e668b2ff13944b902ee +Subproject commit 74222a0e38687068970c8492d794cf92b898c6b6 diff --git a/qtspeech b/qtspeech index 311b5ca4..09a6b3cd 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 311b5ca4c814e6ec54b598d88f1faf7999b11fb5 +Subproject commit 09a6b3cdbef71a56591d2fdeaa2af93199db83cf diff --git a/qtsvg b/qtsvg index 32c93cbc..a844c1c3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 32c93cbca8b2f337e0801537d52e416289b3f464 +Subproject commit a844c1c36551665f19be8a69c0e5e608d24f3a8e diff --git a/qttools b/qttools index 10263f42..ab73d888 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 10263f42de0d2d1fb731deb4213b76fa6c0acd0f +Subproject commit ab73d888c4f41a0d0993abca18680cdcbd79b444 diff --git a/qttranslations b/qttranslations index 60de15a0..ed511017 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 60de15a0e0121096239cf6031250d2862e77971d +Subproject commit ed5110171ca294207f341f46610c716170c06282 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c7a94110..eb9e0957 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c7a94110987672308ed04b40fd8ed207d1c8d93b +Subproject commit eb9e095722e1d953d3bf17bad73f528ac9061488 diff --git a/qtwayland b/qtwayland index 297bcd00..dccec9b2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 297bcd005c4205f69e1bf9e9dc565ab757cf0bac +Subproject commit dccec9b282ae15fa65fd61698dd1cb47325e5c8e diff --git a/qtwebchannel b/qtwebchannel index daecad4c..faab35b4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit daecad4cc7552cff68aa6c87cd78cb3b7a0d73f6 +Subproject commit faab35b4f88c634510e56adcfa6f12f0fef548bb diff --git a/qtwebengine b/qtwebengine index efa90d94..3c88531c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit efa90d944170f0a2f98c482825b9809c77e7792c +Subproject commit 3c88531c3d40c43cd9ac5dc9954668330dab52c1 diff --git a/qtwebglplugin b/qtwebglplugin index 9a19f140..4519f095 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9a19f14013519f3c00a53b4204c7a7d1b2d0acc5 +Subproject commit 4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9 diff --git a/qtwebsockets b/qtwebsockets index e71467cb..bac5a376 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e71467cb569c8d1453e023701b17c9ce9e3fdb86 +Subproject commit bac5a37663249edb9a9746687a7128c013af0309 diff --git a/qtwebview b/qtwebview index e54a993e..8970865f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e54a993e028039be93a46c5decf00194d898b9c4 +Subproject commit 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 diff --git a/qtwinextras b/qtwinextras index f072c959..b1429b32 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f072c959a055b6140297c1bb8deba746ce8c6b72 +Subproject commit b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 diff --git a/qtx11extras b/qtx11extras index 295c13f5..25abe51f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 295c13f5779795c5ec49c7a1ada70287707a8fd6 +Subproject commit 25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13 diff --git a/qtxmlpatterns b/qtxmlpatterns index 15e22118..af06f4fb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 15e22118d01ae39722d1836715fe9cf8b6d3ee88 +Subproject commit af06f4fbf76ef6168529f5de4480d4afd2cf204b From 6c624aa570a41aa964a2574f3fe28586273932b3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Nov 2018 09:44:09 +0000 Subject: [PATCH 12/56] Update submodules on '5.12.0' in qt5 Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 35069301..1b0080a4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 35069301f048eed21a27f89b6495d56c44f2b55d +Subproject commit 1b0080a456871a52ac9b11ed8c9685b93bf20723 diff --git a/qtdeclarative b/qtdeclarative index 7748d3ca..c765d594 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7748d3ca4671edf3b99fcbe7e35f23a747bba191 +Subproject commit c765d5945b75a54d61297b8923497a034020337a diff --git a/qtdoc b/qtdoc index 2e882015..0ebb2367 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2e882015c11a4730da01692c5d650f43ad44c0fe +Subproject commit 0ebb236721fbf4acc595e0214866b69097cbe743 diff --git a/qtlocation b/qtlocation index f777e851..dc761b90 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f777e851f5992a3b813e0d0c68f947c2a2f764fa +Subproject commit dc761b9007416b254eba18a300c5d7f91ca1c552 diff --git a/qtquickcontrols b/qtquickcontrols index 6356a11e..08a6a648 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6356a11e07cbda92b3aa78732b34375cd6c9436e +Subproject commit 08a6a6489e12450befcace2659f123e6c1f1be9a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 936d3117..fc183281 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 936d31179d44220571ded15840bedeccb581c83b +Subproject commit fc1832810f6c09505d9413685ed0b2d6295bea4a diff --git a/qtremoteobjects b/qtremoteobjects index 4b0abba2..cf5ab210 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4b0abba261c87c39e4ce64895b188f6c29fe38a0 +Subproject commit cf5ab210939bcb49f5d79a60ba480fe2a93aa1af diff --git a/qtwebengine b/qtwebengine index ce0335c0..4d6de2ba 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ce0335c0b6c892bfdb06cd52830a705aa6d71d9b +Subproject commit 4d6de2ba36ff4fe17b0e1c8ee7de4f63e2778c9e From caf4c589417d8a9abf3f9f9009055259de59f4d8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Nov 2018 21:31:17 +0100 Subject: [PATCH 13/56] Update submodules on '5.11.3' in qt5 Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 3c88531c..97687f9b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3c88531c3d40c43cd9ac5dc9954668330dab52c1 +Subproject commit 97687f9bdf9eba7ce06f0813f6df3e9ed65e95d5 From 84aaa89cf43b11f4726c7aec7ce65b84f59d1208 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Nov 2018 16:00:29 +0200 Subject: [PATCH 14/56] Provisioning: Fix path for fbx files Currently Qt3d Studio build don't recognize fbx path because of space in folder name. This change will fix it by taken use the packages which don't have space in the folder name. Task-number: QT3DS-2440 Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910 Reviewed-by: Miikka Heikkinen --- coin/provisioning/common/macos/fbx_macos.sh | 30 ++++++------------- .../common/windows/fbx_windows.ps1 | 8 ++--- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/coin/provisioning/common/macos/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh index 7e58a107..e9b7c689 100755 --- a/coin/provisioning/common/macos/fbx_macos.sh +++ b/coin/provisioning/common/macos/fbx_macos.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -39,33 +39,21 @@ set -ex # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" -targetFolder="/opt/fbx" +version="2016.1.2" +fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz" cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName" -officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName" -sha1="f82535423c700c605320c52e13e781c92208ec6b" +# officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz" targetFolder="/tmp" -targetFile="$targetFolder/$fileName" -installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg" echo "Extracting '$cachedUrl'" -tar -xzf "$cachedUrl" -C "$targetFolder" || ( - echo "Failed to uncompress from '$cachedUrl'" - echo "Downloading from '$officialUrl'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl" - echo "Checking SHA1 on PKG '$targetFile'" - echo "$sha1 *$targetFile" > $targetFile.sha1 - shasum --check $targetFile.sha1 - echo "Extracting '$targetFile'" - tar -xzf "$targetFile" -C "$targetFolder" -) +tar -xzf "$cachedUrl" -C "$targetFolder" -rm -rf "$targetFile" -echo "Running installer for '$installer'" -sudo installer -pkg "$installer" -target "/" +rm -rf "$targetFolder/$fileName" +echo "Copying preinstalled FBX SDK to Applications" +sudo cp -r "$targetFolder/Autodesk" /Applications # Set env variables -SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/" +SetEnvVar "FBXSDK" "/Applications/Autodesk/FBXSDK/2016.1.2/" echo "FBX SDK = 2016.1.2" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/fbx_windows.ps1 b/coin/provisioning/common/windows/fbx_windows.ps1 index 7b7abe43..285f1f66 100644 --- a/coin/provisioning/common/windows/fbx_windows.ps1 +++ b/coin/provisioning/common/windows/fbx_windows.ps1 @@ -37,11 +37,11 @@ $version = "2016.1.2" -$name = "fbx20161_2_fbxsdk_vs2015_win" +$name = "fbx20161_2_fbxsdk_vs2015_win_nospace" $packageName = "$name.7z" $installerName = "$name.exe" $cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName" -$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24" +$sha1 = "de80edc255ffd5ce86ba25869dad72b4c809fd41" # The executable is an interactive installer only. We can't run it in a script silently. # $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName" @@ -49,7 +49,7 @@ $sha1 = "3690400625672bef6369bcf90dcde4d78b493b24" # $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e" #$targetFile = "C:\Windows\Temp\$packageName" -$targetFolder = "C:\Program Files\" +$targetFolder = "C:\Utils\" #Write-Host "Downloading '$installerName'" #Download $officialUrl $cacheUrl $targetFile @@ -60,7 +60,7 @@ Extract-7Zip $cacheUrl $targetFolder #Remove-Item -Recurse -Force "$packageName" -Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2" +Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX_SDK\2016.1.2" Write-Output "FBX SDK = $version" >> ~\versions.txt From fbf22546be94446c183a2354fda5dfb1261547f6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 13 Nov 2018 14:19:19 +0100 Subject: [PATCH 15/56] Update submodules on '5.11.3' in qt5 Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90 Reviewed-by: Liang Qi --- qtquickcontrols2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d56c193e..e236382e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d56c193eb4ceb640611d66f22e1f26aae91cd7d1 +Subproject commit e236382e8cc1017597ae67bf739e91a2bd4dfd0a From efb253f0316a9708490b34806a1f229f717b3501 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Nov 2018 19:25:59 +0000 Subject: [PATCH 16/56] Update submodules on '5.12.0' in qt5 Change-Id: Ib05608e04fe7128046e0573e6c029262e2f8280b Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 1b0080a4..d9200fca 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b0080a456871a52ac9b11ed8c9685b93bf20723 +Subproject commit d9200fcac58a9347decd417c217c18b7e34471ec diff --git a/qtdeclarative b/qtdeclarative index c765d594..e3948955 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c765d5945b75a54d61297b8923497a034020337a +Subproject commit e3948955c961972d34483e7da9c2908f5cb84420 diff --git a/qtdoc b/qtdoc index 0ebb2367..1708e352 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0ebb236721fbf4acc595e0214866b69097cbe743 +Subproject commit 1708e352f21e0f542c052e4c8aacea24c0f4fada diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fc183281..0b5f6014 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fc1832810f6c09505d9413685ed0b2d6295bea4a +Subproject commit 0b5f60148f4992381ae79f399b243ecb2774d2ba diff --git a/qtremoteobjects b/qtremoteobjects index cf5ab210..41ed53bf 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cf5ab210939bcb49f5d79a60ba480fe2a93aa1af +Subproject commit 41ed53bf6603858856124f9e8593b804f4e6d1c8 diff --git a/qtscript b/qtscript index 9b0fcf79..78be34c5 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9b0fcf7943e63f35cf7d13c7771cb0185178e9fa +Subproject commit 78be34c5125142a16c117f7508fee603c52cbb36 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d6ca2af5..5d2d0564 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d6ca2af52b8ee363ae02f111cbc57ebb427754d8 +Subproject commit 5d2d0564a36f99224dc53ad477416097516c6b77 diff --git a/qtwebengine b/qtwebengine index 4d6de2ba..5f4e7730 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4d6de2ba36ff4fe17b0e1c8ee7de4f63e2778c9e +Subproject commit 5f4e77307b38e2f8155063e249a6c98802b9175f From 07b6c0554b8b0092ec98c11253cbe9154aa8c186 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Nov 2018 18:00:49 +0000 Subject: [PATCH 17/56] Update submodules on '5.12.0' in qt5 Change-Id: Ice89787923481000fca0409665a366ab8c3540be Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index d9200fca..8e8c11f4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d9200fcac58a9347decd417c217c18b7e34471ec +Subproject commit 8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3 diff --git a/qtdeclarative b/qtdeclarative index e3948955..64ee4968 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e3948955c961972d34483e7da9c2908f5cb84420 +Subproject commit 64ee4968b46019b8e4cb7523a6e41833fc4cf665 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0b5f6014..d3545dbd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0b5f60148f4992381ae79f399b243ecb2774d2ba +Subproject commit d3545dbdfdb30e310c6c962ba92f4fdf57354666 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5d2d0564..0966a84a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5d2d0564a36f99224dc53ad477416097516c6b77 +Subproject commit 0966a84a2a0fa95215ddc2fcb757b92704f9a0c5 diff --git a/qtwebengine b/qtwebengine index 5f4e7730..e0668e65 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5f4e77307b38e2f8155063e249a6c98802b9175f +Subproject commit e0668e653ae3931c5ff70731ac79a5ca9cb52de2 From 5c4d85a9b9e239f2fe1dcfea4df294c888358be8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Nov 2018 20:32:46 +0100 Subject: [PATCH 18/56] Update submodules on '5.11.3' in qt5 Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/qt3d b/qt3d index d4835713..cd3e621c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d4835713b808503ab6d3039f3893355804a8a21d +Subproject commit cd3e621ccf56bb8262f9c8cd967e05bf41934060 diff --git a/qtactiveqt b/qtactiveqt index 4cfbe403..61be6aaf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4cfbe4037ee8f5b1cd96be516cc00c3dbf43c59d +Subproject commit 61be6aaf05d2c57f8fbb504370467367982c5bf2 diff --git a/qtcanvas3d b/qtcanvas3d index 6f0a1143..8726c868 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 +Subproject commit 8726c86872134cf4b4396fa5e7ca8eba4ef37ed4 diff --git a/qtcharts b/qtcharts index 1bf73796..444aeb81 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1bf73796a92ccd1599e5c762b73a76e545e48262 +Subproject commit 444aeb81f2555a37d94862ceaaa8295c5c7ddddd diff --git a/qtdatavis3d b/qtdatavis3d index 7b091d13..a04bbfd9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7b091d13ed5509a73da921a7ed30034a7eb55131 +Subproject commit a04bbfd93159963aa505f96425e85a2a83b0b10a diff --git a/qtdeclarative b/qtdeclarative index 7eaa9368..e3c0bb78 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7eaa93680ce583354f23f3b29bd6db59169dfece +Subproject commit e3c0bb7811407bad1f65ea55639a4b1d1d39be15 diff --git a/qtgamepad b/qtgamepad index e542b1b6..4005b78c 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e542b1b6c46e49baec66d427a2664cc2c6aefa01 +Subproject commit 4005b78c2bde8fd9cf1cbe3155cbe6c33f576111 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7e2544e2..d560b79d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7e2544e28cac2fbf7176b6692dacc57096774249 +Subproject commit d560b79d050659715159d5f04b2e96fd38d0230c diff --git a/qtimageformats b/qtimageformats index 2f61f401..43403038 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2f61f401187d55bb0304591f27792a63a38db00e +Subproject commit 43403038cf75086409bf7ee485ae855fd4c1c1e1 diff --git a/qtmacextras b/qtmacextras index 4b318dbb..9c6ac88d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 4b318dbbb95f4ca60782846ec4b59422953900e7 +Subproject commit 9c6ac88da0509a220dd654d5caa53ff7c87a39d6 diff --git a/qtmultimedia b/qtmultimedia index d9bf5685..6966a09c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9bf568551c9e101374ba842e831650d34d0d41e +Subproject commit 6966a09c9a6a2c134a739446cc582e47d0c6ed6d diff --git a/qtnetworkauth b/qtnetworkauth index ffb63277..90ae677b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ffb63277ac2ac90b4a99a710660d5e66920a8c5a +Subproject commit 90ae677b45570e45adc9d03ba9967065fdfa0432 diff --git a/qtpurchasing b/qtpurchasing index d7257f75..d11d7ff9 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d7257f75e1e9f89a2934c50784d76d90f919605f +Subproject commit d11d7ff9eff2a68441ff6264b04f37bd862bdd64 diff --git a/qtquickcontrols b/qtquickcontrols index cf957e40..6b7f91c0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cf957e407030fc260bd86882cf2f79724126abdd +Subproject commit 6b7f91c097f7e47cf2683d08b5838fd061a872bd diff --git a/qtremoteobjects b/qtremoteobjects index 9fcf2a90..92ae7296 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9fcf2a90db6d6dce1fe03a2f7af4c4a148c35087 +Subproject commit 92ae729691f6db9fb06b0475509dc1141ac3d93c diff --git a/qtscript b/qtscript index ebe11c8e..cf09bc72 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ebe11c8e867bb65ad7cb1424fe4c096935741089 +Subproject commit cf09bc7285793d81a9755bf7e807c9d51d47d980 diff --git a/qtscxml b/qtscxml index a5effbcb..b99d699a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 +Subproject commit b99d699a8e1fe1a2968edafa6f0154a2581c2143 diff --git a/qtsensors b/qtsensors index a4c3631b..0dab0ff3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a4c3631b0bb895b854305ecf2a4632dc949ef2d3 +Subproject commit 0dab0ff3d33292bc1647ebb68dbeb8556707b5ad diff --git a/qtserialbus b/qtserialbus index 200822ca..857ed94b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 200822ca61732693cc97802b953cd846654eb319 +Subproject commit 857ed94b55b59859f41c55076c51e92f163cb9f7 diff --git a/qtserialport b/qtserialport index 74222a0e..5e3f1365 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 74222a0e38687068970c8492d794cf92b898c6b6 +Subproject commit 5e3f1365813079f1a9a9af284b6a40bd9df8e1c0 diff --git a/qtspeech b/qtspeech index 09a6b3cd..e596e640 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 09a6b3cdbef71a56591d2fdeaa2af93199db83cf +Subproject commit e596e640b0eeb32739c6a04459308e1d6bb9c834 diff --git a/qtsvg b/qtsvg index a844c1c3..ab492718 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a844c1c36551665f19be8a69c0e5e608d24f3a8e +Subproject commit ab492718dec3b54fce736b642dc6975d9b0046af diff --git a/qtwayland b/qtwayland index dccec9b2..9ce3088d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dccec9b282ae15fa65fd61698dd1cb47325e5c8e +Subproject commit 9ce3088d226fddc18bcac170fa5cc5be3c29e371 diff --git a/qtwebchannel b/qtwebchannel index faab35b4..94fee0ea 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit faab35b4f88c634510e56adcfa6f12f0fef548bb +Subproject commit 94fee0eaa3a5ce98bae8e5d68c91c0366fa94cdc diff --git a/qtwebengine b/qtwebengine index 97687f9b..64a4c839 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 97687f9bdf9eba7ce06f0813f6df3e9ed65e95d5 +Subproject commit 64a4c8395f9314c9548b6b0cd4a644e68692bf4b diff --git a/qtwebglplugin b/qtwebglplugin index 4519f095..b57a3ce9 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9 +Subproject commit b57a3ce9d95f36ca0f1b1d1e9cf1e20030e882d8 diff --git a/qtwebsockets b/qtwebsockets index bac5a376..395c1f1a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bac5a37663249edb9a9746687a7128c013af0309 +Subproject commit 395c1f1aed90f740f079d8f980c93f459b44733a diff --git a/qtwebview b/qtwebview index 8970865f..779bf9c3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 +Subproject commit 779bf9c3f24365df3f681a029cafd78c7991e929 diff --git a/qtwinextras b/qtwinextras index b1429b32..537d8b04 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 +Subproject commit 537d8b04e002b5e47df9a60cb4f9b888311c61d8 diff --git a/qtx11extras b/qtx11extras index 25abe51f..877c585b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 25abe51f8455fbdaab9d6c4bcb6c8ce7b45f5e13 +Subproject commit 877c585bc474934e3bb1044293a62c72cb01b9cf diff --git a/qtxmlpatterns b/qtxmlpatterns index af06f4fb..657995db 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit af06f4fbf76ef6168529f5de4480d4afd2cf204b +Subproject commit 657995db766faa48084024e780c4cd02fa05c527 From 76b9b7dbd3537b4cb6039a808bd3560c94f64c5a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Nov 2018 05:43:18 +0000 Subject: [PATCH 19/56] Update submodules on '5.11.3' in qt5 Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index c69f4359..08de243e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c69f43594fc921fea82377e7b31a7f55f718051d +Subproject commit 08de243eaa007597c2bfbc97d3d14e2f821ac4be diff --git a/qtdoc b/qtdoc index 44be9a77..66bddfb5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 44be9a776a6efd29fb58b41478eb92bc33dfc1f5 +Subproject commit 66bddfb570e0ccb79ee35636129c350af09d503c diff --git a/qtimageformats b/qtimageformats index 43403038..335dc6af 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 43403038cf75086409bf7ee485ae855fd4c1c1e1 +Subproject commit 335dc6af7d24c1731cbd7e03a21e66c70d81760d diff --git a/qtlocation b/qtlocation index 25c6840f..ffac0dc5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 25c6840ff6585ca9f7ab1c168cdcdd18a68c7885 +Subproject commit ffac0dc5a60c93663f6a4ea5483422c58cdb52b6 diff --git a/qtqa b/qtqa index 184d74f4..bf81b426 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 184d74f49c9951b1525066091088240a997c6092 +Subproject commit bf81b426eceab105d74c0f91eb55e84d6d9ad518 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e236382e..431d605e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e236382e8cc1017597ae67bf739e91a2bd4dfd0a +Subproject commit 431d605edb48321c71935fbd2bb82d33e231ea55 diff --git a/qttools b/qttools index ab73d888..ddc4fba7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ab73d888c4f41a0d0993abca18680cdcbd79b444 +Subproject commit ddc4fba789c21bd0ebca180fa9d7cde399a49e37 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eb9e0957..a8cab520 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eb9e095722e1d953d3bf17bad73f528ac9061488 +Subproject commit a8cab520dc7bedff73ec60a5a189b21cdf01f083 diff --git a/qtwebengine b/qtwebengine index 64a4c839..18412af9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 64a4c8395f9314c9548b6b0cd4a644e68692bf4b +Subproject commit 18412af977d658f243eb5b25b62284924cfa362f From 1deea3debce6bfd0fd45545b3a8e1de80380a9a5 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Fri, 19 Oct 2018 11:01:36 +0300 Subject: [PATCH 20/56] Provisioning: Update openssl to version 1.0.2p MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält (cherry picked from commit 3b4ca5d6c0b44e64efd3776327b4f6714d0d8969) Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/openssl_for_android_linux.sh | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 4 ++-- coin/provisioning/common/windows/openssl.ps1 | 6 +++--- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 353722f2..09d0b6d5 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2o" +version="1.0.2p" 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" installFolder="/home/qt/" -sha="a47faaca57b47a0d9d5fb085545857cc92062691" +sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Until every VM doing Linux Android builds have provisioned the env variable # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. # QTQAINFRA-1436 @@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" tar -xzf "$targetFile" -C "$installFolder" # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}o" "${opensslHome}" +mv "${opensslHome}p" "${opensslHome}" pushd "$opensslHome" echo "Running configure" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d838fcc8..15fe29f8 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -39,9 +39,9 @@ # 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.0.2o" +$version = "1.0.2p" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691" +$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c" $destination = "C:\Utils\openssl-android-master" Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 50bee891..4cc6a3b3 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -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_0_2o" +$version = "1_0_2p" $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 = "86c71a28eda53fa406b957dd37491d616344b464" + $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" 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 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe" +$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 8532f99a..f836cf1d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -opensslVersion="1.0.2o" +opensslVersion="1.0.2p" opensslFile="openssl-$opensslVersion.tar.gz" opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691" +opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" # Below target location has been hard coded into Coin. # QTQAINFRA-1195 From 820a1fbe7c4f4c7a397d564c5a17443cb8d5c3da Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Nov 2018 10:14:42 +0000 Subject: [PATCH 21/56] Update submodules on '5.12.0' in qt5 Change-Id: Id850c3339ddc5fe82ee9c0ef13340e56001fbd15 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 8e8c11f4..61373dff 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8e8c11f4f3d5ccb8b1a9042d363e4d1639797df3 +Subproject commit 61373dff502fd222f68ed84c90bcc1822c4498e6 diff --git a/qtqa b/qtqa index 184d74f4..bf81b426 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 184d74f49c9951b1525066091088240a997c6092 +Subproject commit bf81b426eceab105d74c0f91eb55e84d6d9ad518 diff --git a/qtquickcontrols b/qtquickcontrols index 08a6a648..7250a5c2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 08a6a6489e12450befcace2659f123e6c1f1be9a +Subproject commit 7250a5c2f9dbb61e2c8289f1bf28db2300ce43ad diff --git a/qtremoteobjects b/qtremoteobjects index 41ed53bf..e4631d1a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 41ed53bf6603858856124f9e8593b804f4e6d1c8 +Subproject commit e4631d1a6aa20dfdd32fff2e3764223435fe427f diff --git a/qttools b/qttools index a55cf07c..63f12810 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a55cf07c63a1440b35075480fc2960161dfb60d9 +Subproject commit 63f128103f666e72f5f547871da44e49a9cbafaf diff --git a/qtwebengine b/qtwebengine index e0668e65..a64ac508 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e0668e653ae3931c5ff70731ac79a5ca9cb52de2 +Subproject commit a64ac508573096297723d6f3bb95770a9504ca85 From 1af77cdacf9fc0ad3f32afe1c00cefcd08825716 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Nov 2018 20:39:11 +0100 Subject: [PATCH 22/56] Update submodules on '5.11' in qt5 Change-Id: I809770ab61b7f7544f96b218f89f55c66360e7b8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtqa | 2 +- qttranslations | 2 +- qtwebsockets | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index a07e45b8..68f84a0c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a07e45b86f22ea2d97310bebaeb82339bfda84a1 +Subproject commit 68f84a0c445defc23c2508420734365502134549 diff --git a/qtbase b/qtbase index 527406cb..7f6497e6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 527406cbd99f44470ef87468b73c18df949e8ac7 +Subproject commit 7f6497e623fd66e0dc1ecab89ef16533154a6472 diff --git a/qtqa b/qtqa index 184d74f4..bf81b426 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 184d74f49c9951b1525066091088240a997c6092 +Subproject commit bf81b426eceab105d74c0f91eb55e84d6d9ad518 diff --git a/qttranslations b/qttranslations index ed511017..fb464499 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ed5110171ca294207f341f46610c716170c06282 +Subproject commit fb464499c57179d60786bd6756632ee20f022932 diff --git a/qtwebsockets b/qtwebsockets index bac5a376..5ee35abc 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bac5a37663249edb9a9746687a7128c013af0309 +Subproject commit 5ee35abc39fe35ecf51faac01938ba7ca94e9fb8 From 2d30a2442c586d4d42508aa0222a08086b1cade0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Nov 2018 04:30:59 +0000 Subject: [PATCH 23/56] Update submodules on '5.11' in qt5 Change-Id: I7f6500a82a0967a0adafe719647f40013457a2a5 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 7f6497e6..2a494875 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7f6497e623fd66e0dc1ecab89ef16533154a6472 +Subproject commit 2a494875b8f3d50046d35fb21988c288fcfa1dc7 From c6b7e8d8a8f2f4f4e2dbe67e1e288bc44f6cf803 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 1 Dec 2018 04:30:55 +0000 Subject: [PATCH 24/56] Update submodules on '5.11' in qt5 Change-Id: Idbb6f72e0092d564d76c81f41470e5d687864a00 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtlocation | 2 +- qtscript | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index 68f84a0c..9745006d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 68f84a0c445defc23c2508420734365502134549 +Subproject commit 9745006dadf5685f4ff82c6234938e19b9402801 diff --git a/qtlocation b/qtlocation index d9985cd5..b4beb74d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d9985cd5a308cece06a88e6203529837f00b33aa +Subproject commit b4beb74d93fee205b624c0f0ae6ea39d88d471ac diff --git a/qtscript b/qtscript index ebe11c8e..3e1692be 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ebe11c8e867bb65ad7cb1424fe4c096935741089 +Subproject commit 3e1692bebdf2e4c69adb2a23718ad230a74992dd From 061cf1f2ca98b961746784382e354208f3fc97f1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Dec 2018 14:06:56 +0000 Subject: [PATCH 25/56] Update submodules on '5.12.0' in qt5 Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 61373dff..13ed0664 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 61373dff502fd222f68ed84c90bcc1822c4498e6 +Subproject commit 13ed06640c6cf32ea8c784c896c6bf017053edb3 From e49086eb0dfdb0fdbffea883a9b0880284bc7d1f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Dec 2018 04:30:55 +0000 Subject: [PATCH 26/56] Update submodules on '5.11' in qt5 Change-Id: I07f616fb66b4b3e0f2a5a216c9fe56c0a0f42d6e Reviewed-by: Qt Submodule Update Bot --- qttranslations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qttranslations b/qttranslations index fb464499..c49e22e0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit fb464499c57179d60786bd6756632ee20f022932 +Subproject commit c49e22e0b3a48b67f481f7362b74d90e6596b60f From b093af02077a96f3f77eaf1cbbe3f6c26ecbb2c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Dec 2018 08:57:44 +0100 Subject: [PATCH 27/56] Update submodules on '5.11' in qt5 Change-Id: I72f653e9bdbece531d9d8d053e80d547a5ad56d5 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 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 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 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 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/qt3d b/qt3d index 9745006d..b87b85cf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9745006dadf5685f4ff82c6234938e19b9402801 +Subproject commit b87b85cf0253dd941cec2b7fe763ffe435d74bec diff --git a/qtactiveqt b/qtactiveqt index 4cfbe403..1b97fc12 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4cfbe4037ee8f5b1cd96be516cc00c3dbf43c59d +Subproject commit 1b97fc12b43be7bdb7298ffe677cc81cc0f6aa02 diff --git a/qtbase b/qtbase index 2a494875..cf708de0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2a494875b8f3d50046d35fb21988c288fcfa1dc7 +Subproject commit cf708de03aa96d18c5bc043c90b2795fcf1b0517 diff --git a/qtcanvas3d b/qtcanvas3d index 6f0a1143..6a0b9c09 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 +Subproject commit 6a0b9c09fc9a52778475302495d6862ef79790c7 diff --git a/qtcharts b/qtcharts index 1bf73796..a11cf9df 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1bf73796a92ccd1599e5c762b73a76e545e48262 +Subproject commit a11cf9dfb356108575449665c64003d9e0173aab diff --git a/qtdatavis3d b/qtdatavis3d index 7b091d13..f68245a9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7b091d13ed5509a73da921a7ed30034a7eb55131 +Subproject commit f68245a9bf77278d4578d4ee60d061ed6d70822b diff --git a/qtdeclarative b/qtdeclarative index 0d3eccd2..8e72580d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0d3eccd2a982faa46e8515cd5c55f95adcc5f868 +Subproject commit 8e72580db8ab1ae5f8a1f3b1104bfc111ccb9573 diff --git a/qtdoc b/qtdoc index 9aec0395..a918a2af 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9aec0395d2ab77485984899266350c468b6b26c1 +Subproject commit a918a2af3f26036ff58cc08c22ac4f871a906441 diff --git a/qtgamepad b/qtgamepad index e542b1b6..d8f4ce34 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e542b1b6c46e49baec66d427a2664cc2c6aefa01 +Subproject commit d8f4ce34bc8f3f7930bd4948c0c2a4023bb755a0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7e2544e2..43ab97d4 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7e2544e28cac2fbf7176b6692dacc57096774249 +Subproject commit 43ab97d41f17583a899af14a6c24465cdc9d253f diff --git a/qtimageformats b/qtimageformats index 2f61f401..904aa931 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2f61f401187d55bb0304591f27792a63a38db00e +Subproject commit 904aa931871fe2ebe5cc6b14a55f37658e15ee89 diff --git a/qtlocation b/qtlocation index b4beb74d..de6da4d9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b4beb74d93fee205b624c0f0ae6ea39d88d471ac +Subproject commit de6da4d9a94d35ecb05dd69b188f795a5afd577c diff --git a/qtmacextras b/qtmacextras index 4b318dbb..e1ecedbf 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 4b318dbbb95f4ca60782846ec4b59422953900e7 +Subproject commit e1ecedbf1d8782234c13e742d4a10c4383a60633 diff --git a/qtmultimedia b/qtmultimedia index d9bf5685..21eaa20a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9bf568551c9e101374ba842e831650d34d0d41e +Subproject commit 21eaa20a7c9f1e814b1f0d5ced19668e184ef8a2 diff --git a/qtnetworkauth b/qtnetworkauth index ffb63277..6dd1201a 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ffb63277ac2ac90b4a99a710660d5e66920a8c5a +Subproject commit 6dd1201a74fa4820e82e4481d3850f9f132f9294 diff --git a/qtpurchasing b/qtpurchasing index d7257f75..aec37d5c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d7257f75e1e9f89a2934c50784d76d90f919605f +Subproject commit aec37d5cb1752b924a7cc434da49efb52b5de914 diff --git a/qtquickcontrols b/qtquickcontrols index cf957e40..89179c81 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cf957e407030fc260bd86882cf2f79724126abdd +Subproject commit 89179c8129e95b309992cf3a2a3f9185ed976cf3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d56c193e..4003f44b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d56c193eb4ceb640611d66f22e1f26aae91cd7d1 +Subproject commit 4003f44bbe0704aa82c92d1afe287dfdcf00d437 diff --git a/qtremoteobjects b/qtremoteobjects index 9fcf2a90..8f08b5a6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9fcf2a90db6d6dce1fe03a2f7af4c4a148c35087 +Subproject commit 8f08b5a6b1aea29023e4724921ddc666af04efac diff --git a/qtscript b/qtscript index 3e1692be..46951113 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3e1692bebdf2e4c69adb2a23718ad230a74992dd +Subproject commit 46951113d1cf456038fa0c71cb79ac3bad60fdc5 diff --git a/qtscxml b/qtscxml index a5effbcb..7872f514 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 +Subproject commit 7872f514de00da1d84371d19a9c649b18af1b8d0 diff --git a/qtsensors b/qtsensors index a4c3631b..137d8d37 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a4c3631b0bb895b854305ecf2a4632dc949ef2d3 +Subproject commit 137d8d37e3e62773c57fadc19394b648f4c35a71 diff --git a/qtserialbus b/qtserialbus index afb7f76e..f0fdcdf0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit afb7f76efafcb04e430168416d9d74113bde13bc +Subproject commit f0fdcdf0f42b92e27a15259dfe7da685666bdb85 diff --git a/qtserialport b/qtserialport index 74222a0e..c78d34da 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 74222a0e38687068970c8492d794cf92b898c6b6 +Subproject commit c78d34da2a73ba3c9965a42e327d0c0f105c9bab diff --git a/qtspeech b/qtspeech index 09a6b3cd..85969da7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 09a6b3cdbef71a56591d2fdeaa2af93199db83cf +Subproject commit 85969da7c9b09f7170bcbd4e25907a25f18fbf3a diff --git a/qtsvg b/qtsvg index a844c1c3..adf09500 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a844c1c36551665f19be8a69c0e5e608d24f3a8e +Subproject commit adf09500abb022e66358772b48e9c2cfe769fb58 diff --git a/qttools b/qttools index 1d735db9..c2bd786c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1d735db9b47aa367ad610408a3e310000fc2766f +Subproject commit c2bd786c00ab0c8050f085ab8000f925e4f59983 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eb9e0957..59867f0c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eb9e095722e1d953d3bf17bad73f528ac9061488 +Subproject commit 59867f0ced84484b7ccd9629621b574bca15e8de diff --git a/qtwayland b/qtwayland index dccec9b2..859d6654 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dccec9b282ae15fa65fd61698dd1cb47325e5c8e +Subproject commit 859d6654ef030494647147046778f4206c04d7f6 diff --git a/qtwebchannel b/qtwebchannel index faab35b4..566f1642 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit faab35b4f88c634510e56adcfa6f12f0fef548bb +Subproject commit 566f16426ccf27b6d9259b55a968304a71572828 diff --git a/qtwebengine b/qtwebengine index 07098b56..851e7476 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 07098b5651caca90369af76e97ec1a0a95a39fe3 +Subproject commit 851e74766a96241e3e0e64a945818125b58e72dc diff --git a/qtwebglplugin b/qtwebglplugin index 4519f095..2b79236c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9 +Subproject commit 2b79236c74195243b2bc22a28a1fce0c7b5f95ae diff --git a/qtwebsockets b/qtwebsockets index 5ee35abc..e3dd161d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5ee35abc39fe35ecf51faac01938ba7ca94e9fb8 +Subproject commit e3dd161dd9b9bcc6bb22ac3a0ae9f0b502323f19 diff --git a/qtwebview b/qtwebview index 8970865f..48ebfcdb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 +Subproject commit 48ebfcdbaa4641d309c5760d0859d4e0a900757f diff --git a/qtwinextras b/qtwinextras index b1429b32..4d0276d4 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b1429b32ad3d687f43d7e528cadb95cc4e6f0c57 +Subproject commit 4d0276d49e6a74b2047be1b05f6490599e3d82af diff --git a/qtx11extras b/qtx11extras index 7dd26dd9..46170a55 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 7dd26dd9c760cbc4c8078948b32811ac4ac20a8d +Subproject commit 46170a55710a8cf90650ac641791e199fb066d8f diff --git a/qtxmlpatterns b/qtxmlpatterns index af06f4fb..85d2c1e8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit af06f4fbf76ef6168529f5de4480d4afd2cf204b +Subproject commit 85d2c1e8577f32e52ace93d7fbdb878186d3b863 From a1cd361579829da7b937a4e4b271e61ea29d9f72 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 27 Nov 2018 14:13:50 +0200 Subject: [PATCH 28/56] Provisioning: Add missing prefix for yocto_ssh_configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1a49737188cff6291b16797293a221043bdddad1 Reviewed-by: Juha Karjalainen Reviewed-by: Tony Sarajärvi --- ...yocto_ssh_configurations.sh => 04-yocto_ssh_configurations.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/{yocto_ssh_configurations.sh => 04-yocto_ssh_configurations.sh} (100%) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh rename to coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh From bc12bb763f80b99470d121bea496bb31824fe6d5 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 4 Dec 2018 15:14:19 +0200 Subject: [PATCH 29/56] Provisioning: Windows 10 32bit remote desktop access allow Allow accessing windows remote desktop. Task-number: QTBUG-71874 Change-Id: I70c0acc309bd5e2bc590e7cd35a918ca7940fd03 Reviewed-by: Liang Qi Reviewed-by: Heikki Halmet --- .../qtci-windows-10-x86/01-allow-remote-desktop-access.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/01-allow-remote-desktop-access.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..af05e838 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" From e21401751a7852b13070e3a95ff08058dd19dd5c Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 22 Nov 2018 16:21:17 +0200 Subject: [PATCH 30/56] Provisioning: Change how executables are waited to finish MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch only affects Windows. Python3 provisioning took over 30-35 minutes. As both 32 and 64 bit versions are provisioned it took over 1h this change lowers time taken to 5 minutes. start-process with -wait flag waits for given process and its sub-processes to exit. Wait-process insteads just waits for process to exit. Change-Id: Ib9a323dcf9e2d07318a0d259a72ca4c4d0a4ed80 Reviewed-by: Simo Fält --- coin/provisioning/common/windows/helpers.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 794f1b5d..cbf2371f 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -27,7 +27,8 @@ function Run-Executable $p = Start-Process -FilePath "$Executable" -Wait -PassThru } else { Write-Host "Running `"$Executable`" with arguments `"$Arguments`"" - $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -Wait -PassThru + $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru + Wait-Process -InputObject $p } if ($p.ExitCode -ne 0) { throw "Process $($Executable) exited with exit code $($p.ExitCode)" From 7bee789af37dcd4c5fd043d30fc3320d2bbfd770 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 5 Dec 2018 14:33:34 +0100 Subject: [PATCH 31/56] Add configuration to run qtconnectivity tests on winrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669 Reviewed-by: Tony Sarajärvi Reviewed-by: Alex Blasche --- coin/platform_configs/qtconnectivity.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 coin/platform_configs/qtconnectivity.txt diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt new file mode 100644 index 00000000..4ac73c86 --- /dev/null +++ b/coin/platform_configs/qtconnectivity.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo From a51b2dbf25e59caa5a3065dde9a816ea78300e9c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Dec 2018 22:30:59 +0100 Subject: [PATCH 32/56] Update submodules on '5.12' in qt5 Change-Id: Ib45df166b0096ec1ec198e6cba792cd8a41c05a7 Reviewed-by: Qt Submodule Update Bot Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 21a1469f..0a0a7e4c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 21a1469fb6df237ac1475d1b8c973bb601548f68 +Subproject commit 0a0a7e4ca4f05c7d6da55ec64c8a9734d82853fe diff --git a/qtactiveqt b/qtactiveqt index 3387f697..d33a671b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3387f6974940e412b7f2070d9ecac84597043af5 +Subproject commit d33a671b159f5316ddb7e39f375a07d8740c9d15 diff --git a/qtandroidextras b/qtandroidextras index b4ea411e..22afd6cf 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b4ea411eeda2d816605197b4c6a6b2710147e70a +Subproject commit 22afd6cf09e235f926980d325ca467766d078283 diff --git a/qtbase b/qtbase index 5d276d6a..76f11b0e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5d276d6a1d75d3aca9e206950125e7a77f35ef67 +Subproject commit 76f11b0eda50f05fb0912738be41b4333a82f748 diff --git a/qtcanvas3d b/qtcanvas3d index 9702687d..f0552b1e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 9702687d29745038a54acdb4625e3e6aa7e2694a +Subproject commit f0552b1eb14568fa6802191d13a1123effdbb636 diff --git a/qtcharts b/qtcharts index 5893fd03..db215ad2 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5893fd038e4b299d235b9df9afe912c914fca2ae +Subproject commit db215ad259a98cd82f224dfa80abeec96c5caab1 diff --git a/qtconnectivity b/qtconnectivity index 60863d84..4af2d432 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 60863d840e5ed256bafddc2c98067dd28166df07 +Subproject commit 4af2d432a08a17c741bd01d9a1517b2f17657291 diff --git a/qtdatavis3d b/qtdatavis3d index a8c1b85b..20f42d4c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a8c1b85b91925a7868eeef1fad9e7d1606473f47 +Subproject commit 20f42d4c87162992fc2322e65aee1a1e2b1f28a2 diff --git a/qtdeclarative b/qtdeclarative index ea725e1b..e3446c82 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ea725e1b54e5a28fb7c37f23acfdd95e6269624a +Subproject commit e3446c8225acbaa6a613d6c62e8e2fc58e2b70b0 diff --git a/qtdoc b/qtdoc index a58fa967..71ecf8ed 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a58fa967f267f2ad6f8fbfaec12a5d978b2b6e10 +Subproject commit 71ecf8ed8ee28f07c34136371bbb6f3b50e35d03 diff --git a/qtgamepad b/qtgamepad index c683f8fe..2d532f3d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c683f8feb6cfd9f3b14c85e6eca86b30b7edda9d +Subproject commit 2d532f3d84654e75273af4a5a34310413555e00f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 62ab0462..5b242913 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 62ab04625a77119b0a36d8aef556768e5a08224f +Subproject commit 5b24291329cdbd19b795b4c3d8aafc4ffd916a2d diff --git a/qtimageformats b/qtimageformats index c522f9d4..178b8572 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c522f9d430119447dfbf673252255de9171744e4 +Subproject commit 178b8572d71a34975ffd7ada87227e1b8ed7296e diff --git a/qtlocation b/qtlocation index be0658bf..fa56cc36 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit be0658bfdb37de213f6b54837706aabc2d088d62 +Subproject commit fa56cc36c287108a095f006fa2083796610afe27 diff --git a/qtmacextras b/qtmacextras index 802f3e45..5d104972 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 802f3e4593e7f3c1b43f8e1b050af73a70047e5f +Subproject commit 5d10497214e0dbb3f7d5c2368e5757789ffbbdae diff --git a/qtmultimedia b/qtmultimedia index 06f1f32d..7b0b5bb0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 06f1f32daa89265269532a02457e73912da3c2d7 +Subproject commit 7b0b5bb0b9e15ad54b061ee39712ce86235535d5 diff --git a/qtnetworkauth b/qtnetworkauth index c8530448..71318ed0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c85304484261af2fc046c909087549799a5979f9 +Subproject commit 71318ed079ddf7c0c3af9d70f64b9519e23b7499 diff --git a/qtpurchasing b/qtpurchasing index 6a44af03..2de8d672 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6a44af0358bb5bccb4ec9ae2ab9e2bae95cf4444 +Subproject commit 2de8d672b596c6a67afc2a72a293a08d0a3912d8 diff --git a/qtquickcontrols b/qtquickcontrols index 50b6fb27..5e2dfd09 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 50b6fb27458708a18f4114e3ebec0fa632b2659f +Subproject commit 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e25970ff..9eea1912 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e25970ffff3db1d0b2de17510514b5f92c5ba3eb +Subproject commit 9eea19123b002bc817e103ac3b3f80bdbd87a026 diff --git a/qtremoteobjects b/qtremoteobjects index d369df14..5bc5f04b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d369df14bc634dde9c4c1a101379bb5a536f0332 +Subproject commit 5bc5f04be23237f9d55b2134ae55bd93bed342a0 diff --git a/qtscript b/qtscript index 5ccd29d6..0be84da6 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5ccd29d6720260712655cc6f722824e5fcf11fb3 +Subproject commit 0be84da60090e9d20ec0066bcd3900ca5572df95 diff --git a/qtscxml b/qtscxml index bde8d341..1043e8ab 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bde8d341cc095a3877e4ecc80b02c267bb651d4b +Subproject commit 1043e8abd566aa92f63acedbe188a51e83b9555c diff --git a/qtsensors b/qtsensors index f0c13a29..36d12d57 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f0c13a29a023c3ab42e4a514eea52585896c1c9e +Subproject commit 36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0 diff --git a/qtserialbus b/qtserialbus index fb7a0ef5..ce265ff8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb7a0ef5b31cba52a745006bf9dca61101229de8 +Subproject commit ce265ff81223bf7a5978e66dba59fb4b10469b9e diff --git a/qtserialport b/qtserialport index 4114f45f..a15a7f13 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4114f45fa8f4863a91c37ee06e93275d8b416853 +Subproject commit a15a7f1362454a575a4420cdd89498f42055fe48 diff --git a/qtspeech b/qtspeech index 85e0d04e..f224e530 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 85e0d04e21d2f47eaa0b31c26ee4e04712d523db +Subproject commit f224e5309bc9ee6bf37eb9be2ed345f2cfcb4ce5 diff --git a/qtsvg b/qtsvg index 1a66404f..aa7431fd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1a66404fd0312a835da03a940894737c1bf77310 +Subproject commit aa7431fdabc0434bc30ae8af0753be8c1cb9b576 diff --git a/qttools b/qttools index 7d049fb8..7301cd2d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7d049fb8c8e23a570f5bff95adf49beba44c1619 +Subproject commit 7301cd2df11d07eb58cbfb443348e31c86a00ccf diff --git a/qttranslations b/qttranslations index 350e19a3..074b7308 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 350e19a33858960f513c9e6f2cd57839e9ed04a5 +Subproject commit 074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3715b427..5aaf55ad 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3715b42724b2683454a1ffc1e7d31e13ea449520 +Subproject commit 5aaf55adcf3742e05283274ce1b8c721c7da7c8d diff --git a/qtwayland b/qtwayland index 4fa1ed2d..88041986 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4fa1ed2dfe7ae42b940d6d28e4c1066853e7768a +Subproject commit 88041986f448c14871fac76ee01280736af3f382 diff --git a/qtwebchannel b/qtwebchannel index 7ab88507..a7bb2699 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7ab88507fbd43cc51c2600c1656ed32d56d3703a +Subproject commit a7bb269981ad50bd4e8140aa1d9af9e5abd0784d diff --git a/qtwebengine b/qtwebengine index e76f9a91..21112a89 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e76f9a9106e28a8d2328e00c66071cee3b87d504 +Subproject commit 21112a89e3d742451d6b449fc7075d51266fe709 diff --git a/qtwebglplugin b/qtwebglplugin index bffb574a..d0c4de38 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bffb574a3c28e4b29b4265b255aeef294e70051a +Subproject commit d0c4de38ddc18792c7a8a90ef2d0091b51736dd3 diff --git a/qtwebsockets b/qtwebsockets index 3031fd36..a53a28b9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3031fd369cfb5b7f03aabc61f239adc1268302ff +Subproject commit a53a28b971e3ae1a4a2baf7320ba60f5077f5596 diff --git a/qtwebview b/qtwebview index d53e3164..a14a1174 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d53e316480889660e1668ef4b46a122dc333c499 +Subproject commit a14a1174cdc7ee2142abd33f85ea820eca90c968 diff --git a/qtwinextras b/qtwinextras index 0a0c4f76..669a0856 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0a0c4f76383683ec799344bb57bc44954231c265 +Subproject commit 669a0856ffb6908f02ee6212073fa5799c63fea0 diff --git a/qtx11extras b/qtx11extras index 2326dcdf..12bfa3cb 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 2326dcdf30772c7a73136b5537c02128884579a0 +Subproject commit 12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c diff --git a/qtxmlpatterns b/qtxmlpatterns index 19b28e27..274f162f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 19b28e271ca3f4d0042b739e90b3d902f2866044 +Subproject commit 274f162fd41c4de88df7efda9e6ec16a1ca968bc From 65586dfb4062aad0474aed4d70c477219af4851f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 14 Dec 2018 07:44:07 +0100 Subject: [PATCH 33/56] Update submodules on '5.12' in qt5 Skip qtdeclarative in this round due to QTBUG-72527. Change-Id: I97aa9c1f472e88b3339dc39d841a5ef324b6fd90 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 0a0a7e4c..338addb5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0a0a7e4ca4f05c7d6da55ec64c8a9734d82853fe +Subproject commit 338addb5a79c32d5b7b3013746c6d5250e1581fe diff --git a/qtbase b/qtbase index 76f11b0e..32fd79a2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 76f11b0eda50f05fb0912738be41b4333a82f748 +Subproject commit 32fd79a20fb9b99913bba1537067f5dc8dd96a38 diff --git a/qtcharts b/qtcharts index db215ad2..b36af85e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit db215ad259a98cd82f224dfa80abeec96c5caab1 +Subproject commit b36af85eac67c2e92b35849b34d913ee0290cd2b diff --git a/qtconnectivity b/qtconnectivity index 4af2d432..4a6999d8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4af2d432a08a17c741bd01d9a1517b2f17657291 +Subproject commit 4a6999d8f8ab2eefac53ebcde85a448d2b466d52 diff --git a/qtdoc b/qtdoc index 71ecf8ed..ec479952 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 71ecf8ed8ee28f07c34136371bbb6f3b50e35d03 +Subproject commit ec479952c079c4e3f6b0c015e82f7060af9706bc diff --git a/qtlocation b/qtlocation index fa56cc36..2bb003b7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit fa56cc36c287108a095f006fa2083796610afe27 +Subproject commit 2bb003b7b158890e87731b1a85f3b71008d6284f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9eea1912..b943bbf9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9eea19123b002bc817e103ac3b3f80bdbd87a026 +Subproject commit b943bbf91162ba8aad4a6c3b0c7ca2e944a26105 diff --git a/qttools b/qttools index 7301cd2d..e4ab3c16 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7301cd2df11d07eb58cbfb443348e31c86a00ccf +Subproject commit e4ab3c1687e7e319813a916adb784b307e5f2113 diff --git a/qtwayland b/qtwayland index 88041986..1dc85b95 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 88041986f448c14871fac76ee01280736af3f382 +Subproject commit 1dc85b95ab0adc1e805d059e2c35c671ef790011 diff --git a/qtwebengine b/qtwebengine index 21112a89..4f1e0003 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 21112a89e3d742451d6b449fc7075d51266fe709 +Subproject commit 4f1e0003d98116e33a847360e0e95c46daae25fc From deacc72f73d83e5c16b6524a51fc8401152713bb Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 4 Dec 2018 11:57:26 +0200 Subject: [PATCH 34/56] Provisioning: Hide squish installation output from provisioning log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will prevent the output of unwanted information Change-Id: I547e91ef344ec51f799b26f254139b03d20a315c Reviewed-by: Simo Fält --- coin/provisioning/common/unix/squishInstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 0f31e5fd..4a7a6837 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -122,7 +122,7 @@ function MountAndInstall { 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" + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 mountFolder="/Volumes/froglogic Squish" UnMount elif [[ $targetFile == *.run ]]; then From 2a7ea7c53dfa66c8d53445aeae6776516236a730 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 17 Dec 2018 11:07:51 +0100 Subject: [PATCH 35/56] Update submodules on '5.12' in qt5 Change-Id: Icca1ee8d9b84ca8766e2b6a774098f936970b3ab Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 32fd79a2..87b20009 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 32fd79a20fb9b99913bba1537067f5dc8dd96a38 +Subproject commit 87b20009cc63d3a51e2eb93cd8492c77157b283b diff --git a/qtdeclarative b/qtdeclarative index e3446c82..c401ae27 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e3446c8225acbaa6a613d6c62e8e2fc58e2b70b0 +Subproject commit c401ae278b4bb91c70c6d7df974a241d7c68855b diff --git a/qtlocation b/qtlocation index 2bb003b7..a4442abd 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2bb003b7b158890e87731b1a85f3b71008d6284f +Subproject commit a4442abdc034de7984e003c821939ce1b1976593 From cbdd122e18a067a4564791786c4bb2a7c0d67350 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Fri, 30 Nov 2018 16:17:07 +0200 Subject: [PATCH 36/56] Provisioning: Update install android sdk to version 28 QT needs at least buildSdk 24 after commit 70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk version to 28. Please note minSDK <= targetSDK <= build/compileSDK. Task-number: QTQAINFRA-2412 Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3 Reviewed-by: Liang Qi --- coin/provisioning/common/linux/android_linux.sh | 8 ++++---- coin/provisioning/common/windows/android.ps1 | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 8ff773a3..c77af943 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -54,7 +54,7 @@ toolsFile="sdk-tools-linux-4333796.zip" ndkVersion="r18b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-21" +sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" @@ -80,14 +80,14 @@ else sudo chown -R qt:users "$targetFolder" fi -echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." +echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo "$proxy" | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" else - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" fi echo "Checking the contents of Android SDK..." diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index cd98b747..90c33fbd 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -51,7 +51,7 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" $toolsVersion = "26.1.1" $toolsFile = "sdk-tools-windows-4333796.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-21" +$sdkApiLevel = "android-28" $sdkBuildToolsVersion = "28.0.3" $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" @@ -95,7 +95,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 # Get a PATH where Java's path is defined from previous provisioning [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process") -$sdkmanager_args += " platforms;$sdkApiLevel tools platform-tools build-tools;$sdkBuildToolsVersion" +$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion" Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args" cd $toolsFolder\bin\ $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 717a0767..9d7467ef 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -48,11 +48,14 @@ sdkTargetFolder="$targetFolder/sdk" basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" toolsVersion="r26.1.1" +# toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" + ndkVersion="r18b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-21" +# this is compile sdk version +sdkApiLevel="android-28" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" @@ -70,8 +73,8 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" -echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" +echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." +(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" echo "Checking the contents of Android SDK..." ls -l "$sdkTargetFolder" From eee805a6f18446f013c812591ceb5b047784990c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 18 Dec 2018 09:54:10 +0100 Subject: [PATCH 37/56] Update submodules on '5.12' in qt5 Change-Id: I45912749fc6e25f25e1065b8f7a751d5713ee2c9 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 87b20009..7863be31 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 87b20009cc63d3a51e2eb93cd8492c77157b283b +Subproject commit 7863be311570fa219066df5fe8720d5b92ddb680 diff --git a/qtconnectivity b/qtconnectivity index 4a6999d8..9f5c8e52 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4a6999d8f8ab2eefac53ebcde85a448d2b466d52 +Subproject commit 9f5c8e5253a742d148f713dcbb137ba26ffa4089 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b943bbf9..69f02184 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b943bbf91162ba8aad4a6c3b0c7ca2e944a26105 +Subproject commit 69f02184a9a71f3a5e2dd1ada12367ddccd29787 From db99f0563d6c3998a3cfd2b9521a7893564e981d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 21 Dec 2018 05:07:09 +0000 Subject: [PATCH 38/56] Update submodules on '5.12' in qt5 Change-Id: I03d42c54ab6e4acc9f67612f5a9e34e691ee0192 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 338addb5..ee7d7c3d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 338addb5a79c32d5b7b3013746c6d5250e1581fe +Subproject commit ee7d7c3d7d061902d1ad5409e33f141da61f0b07 diff --git a/qtbase b/qtbase index 7863be31..b45c1e1c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7863be311570fa219066df5fe8720d5b92ddb680 +Subproject commit b45c1e1c0e3dd838543c1e8d4725d9436367a16a diff --git a/qtconnectivity b/qtconnectivity index 9f5c8e52..e9967647 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9f5c8e5253a742d148f713dcbb137ba26ffa4089 +Subproject commit e9967647ffe20df0473a1fa9eb10957b4e32fbf3 diff --git a/qtdeclarative b/qtdeclarative index c401ae27..75ebbd0b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c401ae278b4bb91c70c6d7df974a241d7c68855b +Subproject commit 75ebbd0b354739150e10da7216b44e2dde2c2b14 diff --git a/qtqa b/qtqa index bf81b426..25a8c32e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bf81b426eceab105d74c0f91eb55e84d6d9ad518 +Subproject commit 25a8c32e77692f6ffc5d73136cd6d74cf293e081 diff --git a/qtremoteobjects b/qtremoteobjects index 5bc5f04b..b513d17f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5bc5f04be23237f9d55b2134ae55bd93bed342a0 +Subproject commit b513d17fe19c3cf8790d989626521b52f6d1b3d6 diff --git a/qttools b/qttools index e4ab3c16..e9f39c40 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e4ab3c1687e7e319813a916adb784b307e5f2113 +Subproject commit e9f39c40d98213877317a42d30b78cba102e2017 From 88a777b242a9183545502ed9af9c73bc256c485c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 22 Dec 2018 23:23:23 +0100 Subject: [PATCH 39/56] Update submodules on '5.12' in qt5 Change-Id: I16389902fc5c4ac89d3f287c1b31384a825f6b8e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index ee7d7c3d..080f9d0b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ee7d7c3d7d061902d1ad5409e33f141da61f0b07 +Subproject commit 080f9d0b99b0d2e7e179a41d901096e595000448 diff --git a/qtbase b/qtbase index b45c1e1c..69f7115c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b45c1e1c0e3dd838543c1e8d4725d9436367a16a +Subproject commit 69f7115c43ef17c2d8ff3f7842e64b539da94dcb diff --git a/qtcharts b/qtcharts index b36af85e..eb852ca7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b36af85eac67c2e92b35849b34d913ee0290cd2b +Subproject commit eb852ca7e5800577762663bc72b1f9d009cf7e51 diff --git a/qtdeclarative b/qtdeclarative index 75ebbd0b..c57681bc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 75ebbd0b354739150e10da7216b44e2dde2c2b14 +Subproject commit c57681bc376d1d912d23b044c48932fa8f7816d7 diff --git a/qtlocation b/qtlocation index a4442abd..100e0416 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a4442abdc034de7984e003c821939ce1b1976593 +Subproject commit 100e0416e7faff954221df9ef97920ba512712c0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 69f02184..b563bd58 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 69f02184a9a71f3a5e2dd1ada12367ddccd29787 +Subproject commit b563bd583a50442b52e47f8c5f149aebafb385f2 diff --git a/qtscript b/qtscript index 0be84da6..b65a9693 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0be84da60090e9d20ec0066bcd3900ca5572df95 +Subproject commit b65a9693f730f625cda95684acfaefd21538a5da diff --git a/qtwayland b/qtwayland index 1dc85b95..f2dc41b5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1dc85b95ab0adc1e805d059e2c35c671ef790011 +Subproject commit f2dc41b5babf0a7b51a1735f290540d7be695042 From 4d785fc3db36a11b1d23009d54138099c350d6b6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 24 Dec 2018 22:30:49 +0100 Subject: [PATCH 40/56] Update submodules on '5.12' in qt5 Change-Id: I211a94a83d207cbc522ba4256004c6d17caeeebd Reviewed-by: Qt Submodule Update Bot --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 22afd6cf..8f931f2d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 22afd6cf09e235f926980d325ca467766d078283 +Subproject commit 8f931f2d48ad6e4b1518142036d7631162f57915 diff --git a/qtbase b/qtbase index 69f7115c..f05cc414 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 69f7115c43ef17c2d8ff3f7842e64b539da94dcb +Subproject commit f05cc4144e06fd06eed12a3e427eb49e7ad1cf85 diff --git a/qtconnectivity b/qtconnectivity index e9967647..193e53e5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e9967647ffe20df0473a1fa9eb10957b4e32fbf3 +Subproject commit 193e53e544ebbb5ee60d4ad798648df345679e5a diff --git a/qtwebengine b/qtwebengine index 4f1e0003..540ca045 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4f1e0003d98116e33a847360e0e95c46daae25fc +Subproject commit 540ca045f883d9961a982573a6c30cb7256b7d2c From a1ace2e0977bb385c144b8a903437017f2cfb4a9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 25 Dec 2018 22:30:40 +0100 Subject: [PATCH 41/56] Update submodules on '5.12' in qt5 Change-Id: I252064eb22e7360fdaf31e97bca31da562af6d6f Reviewed-by: Qt Submodule Update Bot --- qttools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qttools b/qttools index e9f39c40..32897fd0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e9f39c40d98213877317a42d30b78cba102e2017 +Subproject commit 32897fd0b98966d22ecbd475a0e6a77ca8b1108d From f95cd8d3f148ce6c5892a73b343f4889ca04762c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Dec 2018 22:30:43 +0100 Subject: [PATCH 42/56] Update submodules on '5.12' in qt5 Change-Id: I4b4259963187eeeb8a4914c5581f3b4c69d70aa5 Reviewed-by: Qt Submodule Update Bot --- qtlocation | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtlocation b/qtlocation index 100e0416..1e24cec7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 100e0416e7faff954221df9ef97920ba512712c0 +Subproject commit 1e24cec7e3ebf5f62f5440d848caf6cd9db1e456 diff --git a/qtmultimedia b/qtmultimedia index 7b0b5bb0..982d4c95 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7b0b5bb0b9e15ad54b061ee39712ce86235535d5 +Subproject commit 982d4c9505cf427709aac18346dd9df4a13f76c5 diff --git a/qtwayland b/qtwayland index f2dc41b5..09b6fcf3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f2dc41b5babf0a7b51a1735f290540d7be695042 +Subproject commit 09b6fcf3ec501cb94d89833745264a16c2a74209 From 0a6d32bdd8487c684402d4c59554bbd1bc01b7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 28 Dec 2018 11:17:48 +0200 Subject: [PATCH 43/56] Provisioning: Install XCode 10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2323 Change-Id: I8fa4e146b2da71fba641f982d8114a916df42fc7 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.13-x86_64/21-install-commandlinetools.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh index 2aa8713b..1ab68fec 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.tar.gz 10.0.0 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh index 83dd1bec..f7c251b1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="10.0.0" +version="10.1" packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName" -sha1="1d6abe29b8df6397c179b8e2ffbfd0293f1282b0" +sha1="c8d198347adf836de7937691282b35e9d086e4c2" InstallCommandLineTools $url $url $sha1 $packageName $version From 55a990322b65bd56ea682c17ba91baf3fb949771 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 12 Dec 2018 13:33:23 +0200 Subject: [PATCH 44/56] Provisioning: Install ODBC for macOS 10.12 10.13 This script installs libiodbc from brew and adds it to CPLUS_INCLUDE_PATH and LIBRARY_PATH thus enabling configure to find it and thus enabling odbc support for qt build on macOS. Task-number: QTBUG-58956 Change-Id: I7f865800b580a87afcc480534da57ee546c74406 Reviewed-by: Antti Kokko --- coin/provisioning/common/macos/libiodbc.sh | 54 +++++++++++++++++++ .../qtci-macos-10.12-x86_64/26-odbc.sh | 7 +++ .../qtci-macos-10.13-x86_64/26-odbc.sh | 7 +++ 3 files changed, 68 insertions(+) create mode 100755 coin/provisioning/common/macos/libiodbc.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh new file mode 100755 index 00000000..6c10ccbf --- /dev/null +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Install libiodbc + +set -ex + +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +brew update +brew install libiodbc + +# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc + +read -r -a arr <<< $(brew list --versions libiodbc) +version=${arr[1]} + +SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH" +SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH" + +echo "libiodbc = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh new file mode 100755 index 00000000..469901b5 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install libiodbc + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/libiodbc.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh new file mode 100755 index 00000000..469901b5 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install libiodbc + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/libiodbc.sh From 2dd72ec5a60f8481198cf2d1ffdf9ef5d734ff52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 11 Dec 2018 10:00:09 +0200 Subject: [PATCH 45/56] Fix .ci.local to .intra.qt.io in provisioning scripts Change-Id: I113095b337c3592757878fb919a0a18a60a8ce7e Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/opcua_unifiedautomation.ps1 | 2 +- coin/provisioning/common/windows/open62541.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 index 18f562c9..aff784b9 100644 --- a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 +++ b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 @@ -38,7 +38,7 @@ $sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022" $installLocation = "C:\Utils\uacpp" Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..." -$internalUrl = "http://ci-files01-hki.ci.local/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip" # No public download link exists $externalUrl = $internalUrl diff --git a/coin/provisioning/common/windows/open62541.ps1 b/coin/provisioning/common/windows/open62541.ps1 index beb09487..b7eceb4d 100644 --- a/coin/provisioning/common/windows/open62541.ps1 +++ b/coin/provisioning/common/windows/open62541.ps1 @@ -70,7 +70,7 @@ function PrepareRepository $zip = "c:\users\$username\downloads\open62541.zip" $externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip" - $internalUrl = "http://ci-files01-hki.ci.local/input/open62541/$commitSHA.zip" + $internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip" Download $externalUrl $internalUrl $zip Verify-Checksum $zip $sha1 From b6283a31c8db19d6d1939957a503e25b98394507 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 31 Dec 2018 22:30:39 +0100 Subject: [PATCH 46/56] Update submodules on '5.12' in qt5 Change-Id: Iafeef38423c165f29169adf499b554b78e1a6c60 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index 080f9d0b..535f7105 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 080f9d0b99b0d2e7e179a41d901096e595000448 +Subproject commit 535f71053d3ca193666d7583f1961280d50da9f5 From 2306cb69c8a76ebf79f6d1fb4216fa8fdfc03f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 12 Sep 2018 10:17:49 +0300 Subject: [PATCH 47/56] Provisioning: Windows: Disable automatic defragmentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automatic disk defragmentation is enabled by default on Windows machines. It should be disabled to save some time. Task-number: QTQAINFRA-2217 Change-Id: I3f024208bd35c9e305569e6b2b562f5a8b16f6f1 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-defragment.ps1 | 34 +++++++++++++++++++ .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + .../02-disable-defragment.ps1 | 1 + 7 files changed, 40 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 diff --git a/coin/provisioning/common/windows/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 new file mode 100644 index 00000000..876938f8 --- /dev/null +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -0,0 +1,34 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 new file mode 100644 index 00000000..10518401 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-defragment.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" From c231323b74e20450e0843a4d8452b6a86b4c12c7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 2 Jan 2019 21:23:22 +0100 Subject: [PATCH 48/56] Update submodules on '5.12' in qt5 Change-Id: I77e2984900d563a6effb5e31c7f20654e5624b71 Reviewed-by: Liang Qi --- qtbase | 2 +- qtlocation | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index f05cc414..9636a43a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f05cc4144e06fd06eed12a3e427eb49e7ad1cf85 +Subproject commit 9636a43abcf98dede8b267f557b728e99f0d56cd diff --git a/qtlocation b/qtlocation index 1e24cec7..04ce8e7f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1e24cec7e3ebf5f62f5440d848caf6cd9db1e456 +Subproject commit 04ce8e7f5b7476a08d4f85287e5afb9976ec2d8c diff --git a/qtwayland b/qtwayland index 09b6fcf3..00c0bad3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 09b6fcf3ec501cb94d89833745264a16c2a74209 +Subproject commit 00c0bad3184e32ff0b1dd799b7ef121eaa737c0d diff --git a/qtwebengine b/qtwebengine index 540ca045..d8eaae80 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 540ca045f883d9961a982573a6c30cb7256b7d2c +Subproject commit d8eaae80844eed5be48a606f2c604157c9cba7b4 From e28da040ee7b4a579efba53e4a8215fc13ade772 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 20 Nov 2018 13:39:30 +0200 Subject: [PATCH 49/56] Provisioning: Unify duplicated openssl provisioning script MacOS(10.12 and 10.13) had two identical provisioning scripts for openssl. Now unified under common. Change-Id: If469a56d431e72b291a810fa9c1b701873fe382d Reviewed-by: Aapo Keskimolo --- .../common/macos/install_openssl.sh | 81 +++++++++++++++++++ .../qtci-macos-10.12-x86_64/35-openssl.sh | 73 +---------------- .../qtci-macos-10.13-x86_64/35-openssl.sh | 73 +---------------- 3 files changed, 83 insertions(+), 144 deletions(-) create mode 100755 coin/provisioning/common/macos/install_openssl.sh diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh new file mode 100755 index 00000000..15f02ffd --- /dev/null +++ b/coin/provisioning/common/macos/install_openssl.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install OpenSSL + +set -ex + +# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +opensslVersion="1.0.2p" +opensslFile="openssl-$opensslVersion.tar.gz" +opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" +opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" +opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" + +# Below target location has been hard coded into Coin. +# QTQAINFRA-1195 +openssl_install_dir=/usr/local/openssl-$opensslVersion +opensslTargetLocation="/usr/local/opt/openssl" + +InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" +cd "/tmp/openssl-$opensslVersion" +pwd +sudo ./config --prefix=$openssl_install_dir +echo "Running 'make' for OpenSSL" +sudo make --silent > /tmp/openssl_make.log 2>&1 +echo "Running 'make install' for OpenSSL" +sudo make --silent install > /tmp/openssl_make_install.log 2>&1 + +path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') +sudo mkdir -p "$path" +sudo ln -s $openssl_install_dir $opensslTargetLocation + +SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" +SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" + +SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" +SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" +SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" + +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem + +sudo rm -rf /tmp/openssl-$opensslVersion + +echo "OpenSSL = $opensslVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index f836cf1d..36bcf53c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -1,76 +1,5 @@ #!/usr/bin/env bash -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install OpenSSL - set -ex -# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -opensslVersion="1.0.2p" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -pwd -sudo ./config --prefix=/usr/local/openssl-$opensslVersion -echo "Running 'make' for OpenSSL" -sudo make --silent > /tmp/openssl_make.log 2>&1 -echo "Running 'make install' for OpenSSL" -sudo make --silent install > /tmp/openssl_make_install.log 2>&1 - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt +source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 9e025a5e..36bcf53c 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -1,76 +1,5 @@ #!/usr/bin/env bash -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install OpenSSL - set -ex -# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -opensslVersion="1.0.2p" -opensslFile="openssl-$opensslVersion.tar.gz" -opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile" -opensslAltDlUrl="https://www.openssl.org/source/$opensslFile" -opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c" - -# Below target location has been hard coded into Coin. -# QTQAINFRA-1195 -opensslTargetLocation="/usr/local/opt/openssl" - -InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion" -cd "/tmp/openssl-$opensslVersion" -pwd -sudo ./config --prefix=/usr/local/openssl-$opensslVersion -echo "Running 'make' for OpenSSL" -sudo make --silent > /tmp/openssl_make.log 2>&1 -echo "Running 'make install' for OpenSSL" -sudo make --silent install > /tmp/openssl_make_install.log 2>&1 - -path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/') -sudo mkdir -p "$path" -sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation - -SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" -SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" - -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem - -sudo rm -rf /tmp/openssl-$opensslVersion - -echo "OpenSSL = $opensslVersion" >> ~/versions.txt +source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" From 2657a96f0ed3868490912bd7dc667b72b28aec76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 30 Aug 2018 09:54:13 +0200 Subject: [PATCH 50/56] Upgrade macOS 10.12.3 to 10.12.6 Also changes the resolution of the desktop to 1280x800x32, timezone to GMT and upgrades Xcode. Task-number: QTBUG-70180 Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751 Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 8878836c..ec35a2dd 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -14,7 +14,7 @@ qtci-linux-openSUSE-42.3-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch +qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 84a6d06f..304eb0b6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -47,4 +47,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2.tar.gz 9.2 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index 462ac422..f7aba0dc 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="8.3.2" -packageName="CommandLineToolsforXcode$version.dmg" +version="9.2" +packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" +sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf" InstallCommandLineTools $url $url $sha1 $packageName $version From 07063160ae5c0ac793285eef45166c91398371ac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Jan 2019 16:48:18 +0100 Subject: [PATCH 51/56] Update submodules on '5.12' in qt5 Change-Id: I8fea0b5ffaadbf5670fd2408b9f9c2e410c49cdb Reviewed-by: Liang Qi --- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 8f931f2d..328418b0 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8f931f2d48ad6e4b1518142036d7631162f57915 +Subproject commit 328418b07dd6f530095008f8a062fa50d2731fe3 diff --git a/qtbase b/qtbase index 9636a43a..dd988e20 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9636a43abcf98dede8b267f557b728e99f0d56cd +Subproject commit dd988e2074fa8d7d230b14ab997bcfc86dc6e1a4 diff --git a/qtdeclarative b/qtdeclarative index c57681bc..c327c43b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c57681bc376d1d912d23b044c48932fa8f7816d7 +Subproject commit c327c43be82c6a2827df1f493ca4e3487a0fc9c3 diff --git a/qtdoc b/qtdoc index ec479952..10b3f2c1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ec479952c079c4e3f6b0c015e82f7060af9706bc +Subproject commit 10b3f2c109eb9737648c4581ad198ae8214be78d diff --git a/qtmultimedia b/qtmultimedia index 982d4c95..5d753119 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 982d4c9505cf427709aac18346dd9df4a13f76c5 +Subproject commit 5d7531192bbb411c24039dd5c68805d42383f547 diff --git a/qtwayland b/qtwayland index 00c0bad3..143a6ad8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 00c0bad3184e32ff0b1dd799b7ef121eaa737c0d +Subproject commit 143a6ad82ea0ded69da482eff1750082fd5b2a6a From 72d0cfc6dc2195d91e2cb89004a09b1e6338a050 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 21 Nov 2018 11:29:51 +0200 Subject: [PATCH 52/56] Provisioning: Add Squish Coco for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2393 Change-Id: I391a2670a46835988da6fd1d9121172c706c7a21 Reviewed-by: Johanna Äijälä --- coin/provisioning/common/linux/squish-coco.sh | 60 +++++++++++++++++++ .../common/windows/squish-coco.ps1 | 48 +++++++++++++++ .../91-squish-coco.sh | 3 + .../qtci-windows-10-x86_64/91-squish-coco.ps1 | 2 + 4 files changed, 113 insertions(+) create mode 100755 coin/provisioning/common/linux/squish-coco.sh create mode 100644 coin/provisioning/common/windows/squish-coco.ps1 create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 diff --git a/coin/provisioning/common/linux/squish-coco.sh b/coin/provisioning/common/linux/squish-coco.sh new file mode 100755 index 00000000..4f8627d3 --- /dev/null +++ b/coin/provisioning/common/linux/squish-coco.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs Squish Coco + +set -ex + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + + +version="4.2.2" +sha1="a44f0f039f3712c715eea63c4021d08bf17a44c6" +package="SquishCocoSetup_${version}_Linux_x86_64.run" +url="http://ci-files01-hki.intra.qt.io/input/coco//$package" + +echo "Enable license for Coco" + +DownloadURL "$url" "$url" "$sha1" "/tmp/$package" +sudo chmod 755 "/tmp/$package" +echo 1 | sudo "/tmp/$package" "--nox11" + +/opt/SquishCoco/bin/cocolic --license-server=Qt-SRV-33.intra.qt.io:49344 + +echo "export PATH=/opt/SquishCoco/bin/:$PATH" >> ~/.bashrc + diff --git a/coin/provisioning/common/windows/squish-coco.ps1 b/coin/provisioning/common/windows/squish-coco.ps1 new file mode 100644 index 00000000..cef4dadf --- /dev/null +++ b/coin/provisioning/common/windows/squish-coco.ps1 @@ -0,0 +1,48 @@ +############################################################################# +# +# Copyright (C) 2018 The Qt Company Ltd. +# Contact: http://www.qt.io/licensing/ +# +# This file is part of the provisioning scripts of the Qt Toolkit. +# +# $QT_BEGIN_LICENSE:LGPL21$ +# Commercial License Usage +# Licensees holding valid commercial Qt licenses may use this file in +# accordance with the commercial license agreement provided with the +# Software or, alternatively, in accordance with the terms contained in +# a written agreement between you and The Qt Company. For licensing terms +# and conditions see http://www.qt.io/terms-conditions. For further +# information use the contact form at http://www.qt.io/contact-us. +# +# GNU Lesser General Public License Usage +# Alternatively, this file may be used under the terms of the GNU Lesser +# General Public License version 2.1 or version 3 as published by the Free +# Software Foundation and appearing in the file LICENSE.LGPLv21 and +# LICENSE.LGPLv3 included in the packaging of this file. Please review the +# following information to ensure the GNU Lesser General Public License +# requirements will be met: https://www.gnu.org/licenses/lgpl.html and +# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +# +# As a special exception, The Qt Company gives you certain additional +# rights. These rights are described in The Qt Company LGPL Exception +# version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +# +# $QT_END_LICENSE$ +# +############################################################################ + +# This script installs Squish Coco for RTA + +. "$PSScriptRoot\helpers.ps1" + + +$coco_version="4.2.2" +$url="http://ci-files01-hki.intra.qt.io/input/coco/SquishCocoSetup_" + $coco_version + "_Windows_x64.exe" +$sha1="d6f9f3c20df086ec9a7e13a068f4446442ae5d51" +$installer="C:\Windows\Temp\SquishCocoSetup_" + $coco_version + "_Windows_x64.exe" + +Download $url $url $installer +Verify-Checksum $installer $sha1 +Run-Executable $installer "/S" +Run-Executable "C:\Program Files\squishcoco\cocolic.exe" "--license-server=Qt-SRV-33.intra.qt.io:49344" +Remove-Item -Force -Path $installer diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh new file mode 100755 index 00000000..43790efd --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 new file mode 100644 index 00000000..bf4f8a96 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-squish-coco.ps1 @@ -0,0 +1,2 @@ + "$PSScriptRoot\..\common\windows\squish-coco.ps1" + From 69b079c38eebf252550c8943f9e432eb7c69c1e2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 4 Jan 2019 16:25:52 +0100 Subject: [PATCH 53/56] Update submodules on '5.12' in qt5 Change-Id: Iccf7bb925a120556c11db3396e67571c69ca9d68 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index dd988e20..8c2ca290 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dd988e2074fa8d7d230b14ab997bcfc86dc6e1a4 +Subproject commit 8c2ca29045498be5fd74b8a4df633e7edae211c6 diff --git a/qtconnectivity b/qtconnectivity index 193e53e5..fb03b1e9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 193e53e544ebbb5ee60d4ad798648df345679e5a +Subproject commit fb03b1e921e641a106722f8f3d59861ce7e6789e diff --git a/qtlocation b/qtlocation index 04ce8e7f..81a9c22e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 04ce8e7f5b7476a08d4f85287e5afb9976ec2d8c +Subproject commit 81a9c22e75f37c8878d41fa2df249ae20bc44adb diff --git a/qtmultimedia b/qtmultimedia index 5d753119..8c26502e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5d7531192bbb411c24039dd5c68805d42383f547 +Subproject commit 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 diff --git a/qtwebengine b/qtwebengine index d8eaae80..005ba799 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d8eaae80844eed5be48a606f2c604157c9cba7b4 +Subproject commit 005ba7997fd4573e65e8c78ad8456ce7a29298a2 From 6e4aed08e13e563b6f82f83b5cb9a4c5f0a48010 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 5 Jan 2019 22:30:51 +0100 Subject: [PATCH 54/56] Update submodules on '5.12' in qt5 Change-Id: I52940e20029c38b79e9f437395d5cf91c4f9f7d4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8c2ca290..2f4eea5b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8c2ca29045498be5fd74b8a4df633e7edae211c6 +Subproject commit 2f4eea5b9cce7b438eeb9016c52a67937d536793 diff --git a/qtwebengine b/qtwebengine index 005ba799..123f97da 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 005ba7997fd4573e65e8c78ad8456ce7a29298a2 +Subproject commit 123f97da6e6bb718682ba046a9ee82a24403cd86 diff --git a/qtwebsockets b/qtwebsockets index a53a28b9..16bfc98a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a53a28b971e3ae1a4a2baf7320ba60f5077f5596 +Subproject commit 16bfc98a03186cef5aafa79709b086faa0d4f9f2 From fe79ca444bd3478a9b5a7b5cac327796a0e486a5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 6 Jan 2019 19:19:51 +0100 Subject: [PATCH 55/56] Update submodules on '5.12' in qt5 Change-Id: I3ce524dab858e04fd2098385557893efbfa4c6ad Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index 535f7105..6385ec66 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 535f71053d3ca193666d7583f1961280d50da9f5 +Subproject commit 6385ec6686467112256d68146d608c77fac9cea2 diff --git a/qtbase b/qtbase index 2f4eea5b..ecdccce8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2f4eea5b9cce7b438eeb9016c52a67937d536793 +Subproject commit ecdccce8e468784e050b65052da193bb40e2d9b9 From ca52fc7e29a6d145be03bf6773fcca6e3056034e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 7 Jan 2019 20:55:35 +0100 Subject: [PATCH 56/56] Update submodules on '5.12' in qt5 Change-Id: I68c69cdc9b74c52bc0729fc51144a8fdd9d783ec Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 6385ec66..9d61881e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6385ec6686467112256d68146d608c77fac9cea2 +Subproject commit 9d61881e4bcaebd6f98e647163f1df6b5082a6a8 diff --git a/qtactiveqt b/qtactiveqt index d33a671b..22bcc219 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d33a671b159f5316ddb7e39f375a07d8740c9d15 +Subproject commit 22bcc219a54ddccf000ca6f33057f94ed8bb9551 diff --git a/qtandroidextras b/qtandroidextras index 328418b0..48256a15 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 328418b07dd6f530095008f8a062fa50d2731fe3 +Subproject commit 48256a153eefaeb772d3be97b0c19e3402e0e027 diff --git a/qtbase b/qtbase index ecdccce8..772f56c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ecdccce8e468784e050b65052da193bb40e2d9b9 +Subproject commit 772f56c3cf54dc34dbaa3ae50570a006f9e7721a diff --git a/qtcanvas3d b/qtcanvas3d index f0552b1e..893fbdd0 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f0552b1eb14568fa6802191d13a1123effdbb636 +Subproject commit 893fbdd0f0002b3ff74f6f428329191d120ed439 diff --git a/qtcharts b/qtcharts index eb852ca7..ce310464 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit eb852ca7e5800577762663bc72b1f9d009cf7e51 +Subproject commit ce310464de075a6865952c0845f93a6ea3c1ff6c diff --git a/qtconnectivity b/qtconnectivity index fb03b1e9..99b308ab 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fb03b1e921e641a106722f8f3d59861ce7e6789e +Subproject commit 99b308ab5488e5cfa77f5078eebc2fa9387217b8 diff --git a/qtdatavis3d b/qtdatavis3d index 20f42d4c..9ab15db1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 20f42d4c87162992fc2322e65aee1a1e2b1f28a2 +Subproject commit 9ab15db10215cef84a58a57411f1d27f83aa4b66 diff --git a/qtdeclarative b/qtdeclarative index c327c43b..5ed082ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c327c43be82c6a2827df1f493ca4e3487a0fc9c3 +Subproject commit 5ed082ea4ce3580134a9a0c83e6fdb81a6231c8e diff --git a/qtdoc b/qtdoc index 10b3f2c1..bfe54113 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 10b3f2c109eb9737648c4581ad198ae8214be78d +Subproject commit bfe541139193dafed078c31469e5640ca4c74216 diff --git a/qtgamepad b/qtgamepad index 2d532f3d..35753029 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2d532f3d84654e75273af4a5a34310413555e00f +Subproject commit 357530292e29a25ff6ddec17a3acbf67588813e8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5b242913..cdb0a5dd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5b24291329cdbd19b795b4c3d8aafc4ffd916a2d +Subproject commit cdb0a5dddf84e27dda294cecebd64c282227f162 diff --git a/qtimageformats b/qtimageformats index 178b8572..cbdabc6a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 178b8572d71a34975ffd7ada87227e1b8ed7296e +Subproject commit cbdabc6a23d9ac66c7361a4437f649aacab7d900 diff --git a/qtlocation b/qtlocation index 81a9c22e..1688c44d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 81a9c22e75f37c8878d41fa2df249ae20bc44adb +Subproject commit 1688c44d223145abfdca19a7b31faecbafb0d315 diff --git a/qtmacextras b/qtmacextras index 5d104972..a76ea12d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5d10497214e0dbb3f7d5c2368e5757789ffbbdae +Subproject commit a76ea12dc8f740b2adfd095ea3d6a6c727e27da1 diff --git a/qtmultimedia b/qtmultimedia index 8c26502e..80898b03 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 +Subproject commit 80898b03be54e2855472987f60f4c2526344389b diff --git a/qtnetworkauth b/qtnetworkauth index 71318ed0..c6d51bdf 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 71318ed079ddf7c0c3af9d70f64b9519e23b7499 +Subproject commit c6d51bdf097c133955a247c9ebc600c5bc6cff58 diff --git a/qtpurchasing b/qtpurchasing index 2de8d672..ba689d67 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 2de8d672b596c6a67afc2a72a293a08d0a3912d8 +Subproject commit ba689d672e74c89bc0aca78f2a8e816c279e9100 diff --git a/qtquickcontrols b/qtquickcontrols index 5e2dfd09..bd952e90 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb +Subproject commit bd952e904070d8eb07748d620829e9dadb8022ba diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b563bd58..520657bd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b563bd583a50442b52e47f8c5f149aebafb385f2 +Subproject commit 520657bdfa0aba68e31758c5952a01c45940cd8f diff --git a/qtremoteobjects b/qtremoteobjects index b513d17f..ab6e0edd 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b513d17fe19c3cf8790d989626521b52f6d1b3d6 +Subproject commit ab6e0edd1a2e25a83c7884b7ce126e7039573eda diff --git a/qtscript b/qtscript index b65a9693..520fb917 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b65a9693f730f625cda95684acfaefd21538a5da +Subproject commit 520fb9177a3e86cb7c27b752e5a4c3798dc4b4f9 diff --git a/qtscxml b/qtscxml index 1043e8ab..2dfb1d04 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1043e8abd566aa92f63acedbe188a51e83b9555c +Subproject commit 2dfb1d046d4a1dcb046bfb287d240a8869c78baa diff --git a/qtsensors b/qtsensors index 36d12d57..450f9327 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0 +Subproject commit 450f932762eef448081a22e98fa93a191bd9a804 diff --git a/qtserialbus b/qtserialbus index ce265ff8..2b51f76a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ce265ff81223bf7a5978e66dba59fb4b10469b9e +Subproject commit 2b51f76ab712690cc263516d628a4f8cbb723ba8 diff --git a/qtserialport b/qtserialport index a15a7f13..f7580fc3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a15a7f1362454a575a4420cdd89498f42055fe48 +Subproject commit f7580fc30b4ed060b5075be6592c5c0703d40c53 diff --git a/qtspeech b/qtspeech index f224e530..66aa85ed 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f224e5309bc9ee6bf37eb9be2ed345f2cfcb4ce5 +Subproject commit 66aa85ede203372e3c9eba6c399379fa2f3de43f diff --git a/qtsvg b/qtsvg index aa7431fd..a3080340 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aa7431fdabc0434bc30ae8af0753be8c1cb9b576 +Subproject commit a308034012e6cbd35191edb710b721271ce1547a diff --git a/qttools b/qttools index 32897fd0..7249ba65 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 32897fd0b98966d22ecbd475a0e6a77ca8b1108d +Subproject commit 7249ba659951a9ca388a7a09cd301a2d9f79eaa4 diff --git a/qttranslations b/qttranslations index 074b7308..c36807f0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a +Subproject commit c36807f030790ed9bcf9e790d02f765d67d2b8ea diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5aaf55ad..c3fa86ec 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5aaf55adcf3742e05283274ce1b8c721c7da7c8d +Subproject commit c3fa86ece61132155aec047e21772c813a87ddeb diff --git a/qtwayland b/qtwayland index 143a6ad8..024be9dc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 143a6ad82ea0ded69da482eff1750082fd5b2a6a +Subproject commit 024be9dcae26a0d88ffb76f9fca252f2135ad7c9 diff --git a/qtwebchannel b/qtwebchannel index a7bb2699..68ab691b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a7bb269981ad50bd4e8140aa1d9af9e5abd0784d +Subproject commit 68ab691b04d14c8a5582c14842246b1041436094 diff --git a/qtwebengine b/qtwebengine index 123f97da..907303d8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 123f97da6e6bb718682ba046a9ee82a24403cd86 +Subproject commit 907303d85385a9bc7dc4cf8eae771dbe5979ff0d diff --git a/qtwebglplugin b/qtwebglplugin index d0c4de38..c76e2a37 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d0c4de38ddc18792c7a8a90ef2d0091b51736dd3 +Subproject commit c76e2a37310f1e94002488fe33d56d6b00f2d626 diff --git a/qtwebsockets b/qtwebsockets index 16bfc98a..e567b9d8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 16bfc98a03186cef5aafa79709b086faa0d4f9f2 +Subproject commit e567b9d8c8447f8d2bd35ab3184b956e95380222 diff --git a/qtwebview b/qtwebview index a14a1174..0a68deca 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a14a1174cdc7ee2142abd33f85ea820eca90c968 +Subproject commit 0a68deca4de8eca51024cd7ca4235d274cf984fd diff --git a/qtwinextras b/qtwinextras index 669a0856..fac73fd0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 669a0856ffb6908f02ee6212073fa5799c63fea0 +Subproject commit fac73fd06ec6084c41190e80df59a66bc72f7fdb diff --git a/qtx11extras b/qtx11extras index 12bfa3cb..c3f2f14d 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c +Subproject commit c3f2f14d64c8301cdce8b1a9b383ca8eaaec6406 diff --git a/qtxmlpatterns b/qtxmlpatterns index 274f162f..a6efe402 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 274f162fd41c4de88df7efda9e6ec16a1ca968bc +Subproject commit a6efe4020c83384b0aa88aa71da49fce679bc24d