Compare commits

..

9 Commits
6.4 ... 6.4.3

Author SHA1 Message Date
Qt Submodule Update Bot
cdcd144701 Update submodules on '6.4.3 in qt/qt5'
Change-Id: I8f0a7c4e4d418463bba775f90a3c074dc7d586e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-12 07:54:22 +00:00
Qt Submodule Update Bot
2bec217231 Update submodules on '6.4.3 in qt/qt5'
Change-Id: I5cfbbb580c7550fa28c479ae2f9a40da665ecce6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-11 11:39:51 +00:00
Qt Submodule Update Bot
fc2dc9a598 Update submodules on '6.4.3 in qt/qt5'
Change-Id: Ib79b9d6a6da2854aa139f3390aa0e0e80d7c9ea5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-08 21:48:46 +00:00
Qt Submodule Update Bot
e0e5bbc92e Update submodules on '6.4.3 in qt/qt5'
Change-Id: I70ebac494d814b333e79d953c3a3cdca26d4fd8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-07 03:53:24 +00:00
Qt Submodule Update Bot
74628b7479 Update submodules on '6.4.3 in qt/qt5'
Change-Id: I090f5729fd7df4e2ce9c7b899b867b22b27b82cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-03 17:15:49 +00:00
Qt Submodule Update Bot
4ae9f2c44a Update submodules on '6.4.3 in qt/qt5'
Change-Id: I32077bfc0df7382cfce7fbb413310db145131974
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-02 02:52:44 +00:00
Qt Submodule Update Bot
d2434fe2a1 Update submodules on '6.4.3 in qt/qt5'
Change-Id: I487acaad24055db62f165f8499347850c5cbf08b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-27 03:53:37 +00:00
Qt Submodule Update Bot
88810bb92d Update submodules on '6.4.3 in qt/qt5'
Change-Id: I593e3874293b1625ea19474ce163b29b7b74dd6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-23 18:13:24 +00:00
Jani Heikkinen
1f98ca10d8 Adjust submodule branches
Change-Id: I20d0f6e517a180596bedc3d73a1ad39dddbc8240
2023-02-22 17:18:20 +02:00
42 changed files with 84 additions and 126 deletions

76
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 6.4
branch = 6.4.3
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative
url = ../qtdeclarative.git
branch = 6.4
branch = 6.4.3
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtmultimedia"]
depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d
path = qtmultimedia
url = ../qtmultimedia.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 6.4
branch = 6.4.3
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 6.4
branch = 6.4.3
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia
path = qtdoc
url = ../qtdoc.git
branch = 6.4
branch = 6.4.3
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtserialport
path = qtpositioning
url = ../qtpositioning.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -117,61 +117,61 @@
recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = 6.4
branch = 6.4.3
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtgamepad"]
depends = qtbase
@@ -219,27 +219,27 @@
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
@@ -252,68 +252,68 @@
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline
path = qtquick3d
url = ../qtquick3d.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = 6.4
branch = 6.4.3
status = deprecated
[submodule "qtcoap"]
depends = qtbase
path = qtcoap
url = ../qtcoap.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative
path = qtmqtt
url = ../qtmqtt.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative
path = qtopcua
url = ../qtopcua.git
branch = 6.4
branch = 6.4.3
status = addon
[submodule "qtlanguageserver"]
depends = qtbase
path = qtlanguageserver
url = ../qtlanguageserver.git
branch = 6.4
branch = 6.4.3
status = preview
[submodule "qthttpserver"]
depends = qtbase
recommends = qtwebsockets
path = qthttpserver
url = ../qthttpserver.git
branch = 6.4
branch = 6.4.3
status = preview
[submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics
url = ../qtquick3dphysics.git
branch = 6.4
branch = 6.4.3
status = preview

View File

@@ -73,57 +73,15 @@ function Install {
Remove-Item -Force -Path $installerPath
}
function Get-Vswhere-Property {
Param (
[ValidateSet(2017, 2019, 2022)]
[int] $vsYear = $(BadParam("Visual Studio Year")),
[ValidatePattern("Professional|Build *Tools|Community|Enterprise")]
[string] $vsEdition = $(BadParam("Visual Studio Edition")),
[string] $property = $(BadParam("vswhere property"))
)
$range = switch ($vsYear)
{
2017 { "[15.0,16`)" }
2019 { "[16.0,17`)" }
2022 { "[17.0,18`)" }
}
$vsEdition = $vsEdition -replace " ",""
$vswhereInfo = New-Object System.Diagnostics.ProcessStartInfo
$vswhereInfo.FileName = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
$vswhereInfo.RedirectStandardError = $true
$vswhereInfo.RedirectStandardOutput = $true
$vswhereInfo.UseShellExecute = $false
$vswhereInfo.Arguments = "-version $range", "-latest", `
"-products Microsoft.VisualStudio.Product.$vsEdition", "-property $property"
$vswhereProcess = New-Object System.Diagnostics.Process
$vswhereProcess.StartInfo = $vswhereInfo
$vswhereProcess.Start() | Out-Null
$vswhereProcess.WaitForExit()
$stdout = $vswhereProcess.StandardOutput.ReadToEnd()
if ([string]::IsNullOrEmpty($stdout))
{
throw "VS edition or property $property not found by vswhere"
}
$stderr = $vswhereProcess.StandardError.ReadToEnd()
$vsExit = $vswhereProcess.ExitCode
if ($vsExit -ne 0)
{
throw "vswhere failed with exit code $vsExit. stderr: $stderr"
}
return $stdout
}
Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller
# Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller
$msvc2019Version = Get-Vswhere-Property 2019 "Professional" catalog_productDisplayVersion
$msvc2019Complete = Get-Vswhere-Property 2019 "Professional" isComplete
$msvc2019Launchable = Get-Vswhere-Property 2019 "Professional" isLaunchable
$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
-version [16.0,17.0`) -latest -property catalog_productDisplayVersion 2`>`&1)
$msvc2019Complete = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
-version [16.0,17.0`) -latest -property isComplete 2`>`&1)
$msvc2019Launchable = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
-version [16.0,17.0`) -latest -property isLaunchable 2`>`&1)
if($msvc2019Version -ne $version -or [int]$msvc2019Complete -ne 1 `
-or [int]$msvc2019Launchable -ne 1) {

2
qt3d

Submodule qt3d updated: 0c13d600cc...2fe0cb2cb7

2
qtbase

Submodule qtbase updated: 4822af4f41...519d2d8f44

2
qtcoap

Submodule qtcoap updated: 232503a472...6262b588b6

2
qtdoc

Submodule qtdoc updated: 7e3f895b6f...a67bf2c1c6

2
qtmqtt

Submodule qtmqtt updated: 3a5732eeea...ff66c116ff

Submodule qtopcua updated: c269102dc8...5bce9401c1

2
qtqa

Submodule qtqa updated: b370dadf6d...89bd1c8671

Submodule qtscxml updated: fa7177340e...56c2ce89ed

2
qtsvg

Submodule qtsvg updated: 4ba7e78b2c...793dde4644

Submodule qttools updated: e2100dac61...e5c0657f46