diff options
| -rw-r--r-- | .gitmodules | 80 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/vclibs_debug.ps1 | 16 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 | 3 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 | 3 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtremoteobjects | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qtvirtualkeyboard | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
21 files changed, 62 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index 3449e50c..72b451de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,59 +1,59 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.12 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.12 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.12 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.12 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.12 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.12 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 5.12 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.12 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.12 status = essential priority = 30 [submodule "qtdoc"] @@ -61,7 +61,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.12 status = essential priority = 40 [submodule "qtrepotools"] @@ -82,14 +82,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.12 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.12 status = addon [submodule "qtsystems"] depends = qtbase @@ -122,185 +122,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.12 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.12 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.12 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.12 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.12 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.12 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.12 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.12 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.12 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.12 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.12 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.12 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.12 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.12 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.12 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.12 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.12 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.12 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.12 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = 5.12 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 5.12 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = 5.12 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 5.12 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 5.12 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = 5.12 status = preview diff --git a/coin/provisioning/common/windows/vclibs_debug.ps1 b/coin/provisioning/common/windows/vclibs_debug.ps1 new file mode 100644 index 00000000..e9020694 --- /dev/null +++ b/coin/provisioning/common/windows/vclibs_debug.ps1 @@ -0,0 +1,16 @@ +function Install-VCLibsDebug +{ + Param ( + [string]$Arch + ) + + $installedPackage = Get-AppxPackage Microsoft.VCLibs.140.00.Debug | Where-Object {$_.Architecture -eq $Arch} + if ($installedPackage) { + Write-Host "Debug VCLibs already installed for $Arch." + return + } + + Add-AppxPackage "C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx" + + Write-Host "Debug VCLibs successfully installed for $Arch." +} diff --git a/coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 b/coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 new file mode 100644 index 00000000..56ecb97b --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/90-vclibs_debug.ps1 @@ -0,0 +1,3 @@ +. "$PSScriptRoot\..\common\windows\vclibs_debug.ps1" + +Install-VCLibsDebug X86 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 new file mode 100644 index 00000000..49148017 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-vclibs_debug.ps1 @@ -0,0 +1,3 @@ +. "$PSScriptRoot\..\common\windows\vclibs_debug.ps1" + +Install-VCLibsDebug X64 diff --git a/qt3d b/qt3d -Subproject ebd195c59fe50c49dd28f27828afa802384d701 +Subproject db836a410555108adff3bd594cf75f4174069f0 diff --git a/qtactiveqt b/qtactiveqt -Subproject 4bbc782fc70f30e8b1530e87c85a8f453deb051 +Subproject e75a541dbb27119c31ffd6dd36c38cd8a81f243 diff --git a/qtbase b/qtbase -Subproject 346c15102b14c58b8aaeed2c1586cd3100200e2 +Subproject ee2e38490d51667e878ed1732df387a6d9f2a5f diff --git a/qtconnectivity b/qtconnectivity -Subproject 05cad85003f5bdb15834fe4eb651fdcc5787436 +Subproject 7d3ee483c5fc348f43d93c0be0909e769dc5160 diff --git a/qtdeclarative b/qtdeclarative -Subproject 87a4d4babe0a3d6b8a57048205eccc710593147 +Subproject a29ab499a4822014d34d6e9e988600fdb6d60a0 diff --git a/qtdoc b/qtdoc -Subproject 3236562180cfa298ed16525b2a1d2757f514a14 +Subproject fc581c25729d97693d040942074509577343680 diff --git a/qtlocation b/qtlocation -Subproject 0a9ef37972aed19ec4451d0a0e24bfacc56bded +Subproject 07be65e9d9a883aab4e1fda367cf591b7cb9763 diff --git a/qtmultimedia b/qtmultimedia -Subproject ec597d89320dd312382457a711ebddb085b16a5 +Subproject 6dda96f4d4681f7107931bea4c5a0f3fc35bec8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject b88941e62c533474f4658a212133089e0486367 +Subproject 628df3881fbb3d3bd1ee4316b47df5871c6dad7 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject e170cbe42b8f654894e4035c8ddfd6759a034be +Subproject 8761c1a282f596a64e0fc624c87added43fb47d diff --git a/qtserialbus b/qtserialbus -Subproject 9f5b14b06775e91ac65dc3c0b0ea3a54235a93a +Subproject 34d346c161bf89a6a98d4782627a5c4f12271bd diff --git a/qttools b/qttools -Subproject bc7ed4f112c85ac9db5a4126eb446591e0283bc +Subproject 6e60c31d3513da3a9ec5e9a38326961bc6a3292 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 9463ad7c01c8cda0af27d9ec0692a61af171d29 +Subproject 246c406fc2bad945284704bb6613ae9adf3230e diff --git a/qtwayland b/qtwayland -Subproject c7e775aef78b655666916bba15196c89dbf0b43 +Subproject 88851b6de433ab25047166bf4708e99e111b7af diff --git a/qtwebengine b/qtwebengine -Subproject b74e93a9b07243da4f3d2784cde49916de45536 +Subproject 0358558a3a22c0fdb586de95e4c48bced96ff6c diff --git a/qtwebsockets b/qtwebsockets -Subproject 790586e42920a4cbf10bb808aa1b716247628cc +Subproject 85e345a38709026d4d82c67b901633867585124 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject b9b941945dc63a48652576c806e10dfeb15005e +Subproject e95c186fe8da96fba394490f9bca817534124b6 |