From ff2c96f48345a132106f276069ea0d9e2d21e377 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 22 Oct 2018 15:52:09 +0200 Subject: [PATCH 01/15] 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/15] 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/15] 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 9a9f35850828f7448e293a10d1d4210a9f5f59d2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 1 Nov 2018 12:00:30 +0100 Subject: [PATCH 04/15] 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 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 6c624aa570a41aa964a2574f3fe28586273932b3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Nov 2018 09:44:09 +0000 Subject: [PATCH 10/15] 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 84aaa89cf43b11f4726c7aec7ce65b84f59d1208 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Nov 2018 16:00:29 +0200 Subject: [PATCH 11/15] 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 efb253f0316a9708490b34806a1f229f717b3501 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Nov 2018 19:25:59 +0000 Subject: [PATCH 12/15] 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 13/15] 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 820a1fbe7c4f4c7a397d564c5a17443cb8d5c3da Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Nov 2018 10:14:42 +0000 Subject: [PATCH 14/15] 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 061cf1f2ca98b961746784382e354208f3fc97f1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Dec 2018 14:06:56 +0000 Subject: [PATCH 15/15] 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