mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-26 18:05:59 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d94fd443b6 | ||
|
|
83d940842c | ||
|
|
5467b00de4 | ||
|
|
9616544a55 | ||
|
|
01752b6e21 | ||
|
|
13b721c62d |
80
.gitmodules
vendored
80
.gitmodules
vendored
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
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.10
|
||||
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.10
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,185 +123,185 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.12
|
||||
branch = 5.12.10
|
||||
status = addon
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# Allow SMB client guest logons to SMB server.
|
||||
reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F
|
||||
@@ -0,0 +1,48 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
|
||||
# This script will install VC Redistributable
|
||||
|
||||
$sha1 = "a55510a8c9708b2c68b39cd50bbcaf86e2c885f0"
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VC_redist.x64.exe"
|
||||
# https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
|
||||
$url_official = "https://aka.ms/vs/16/release/vc_redist.x64.exe"
|
||||
$package = "C:\Windows\Temp\vc_redist.x64.exe"
|
||||
|
||||
Download $url_official $url_cache $package
|
||||
Verify-Checksum $package $sha1
|
||||
Run-Executable "$package" "/install /quiet /norestart"
|
||||
|
||||
Remove-Item -Recurse -Force -Path $package
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 648daeb819...c9d86b593e
Submodule qtactiveqt updated: 94044c1991...d09457fadc
Submodule qtandroidextras updated: 43c6aa63bb...b6a10faf96
2
qtbase
2
qtbase
Submodule qtbase updated: 991fb57e78...c919fc5f65
Submodule qtcanvas3d updated: 898baba2f6...b977d8c14c
2
qtcharts
2
qtcharts
Submodule qtcharts updated: f6ddb04a31...754f8d15a0
Submodule qtconnectivity updated: 526caeb24a...568c411f27
Submodule qtdatavis3d updated: d057ce79a8...dae7527bee
Submodule qtdeclarative updated: 2596946398...36e4e9bbd4
2
qtdoc
2
qtdoc
Submodule qtdoc updated: a4e9fea17e...e10560e0e3
Submodule qtgamepad updated: c7466b9948...93b710ebc5
Submodule qtgraphicaleffects updated: e15565d63f...fabaae2f80
Submodule qtimageformats updated: 39e7b00a72...7518d381be
Submodule qtlocation updated: bafd8aa9a4...3c7489c380
Submodule qtmacextras updated: dddd4504c2...1fc8c238f3
Submodule qtmultimedia updated: 9fc291c75f...67ab370d6a
Submodule qtnetworkauth updated: cd823aa708...2bcf17c3e4
Submodule qtpurchasing updated: 8cee104e62...f3cbd45315
2
qtqa
2
qtqa
Submodule qtqa updated: bb9309475c...bc1b16f51b
Submodule qtquickcontrols updated: 747def904f...8c37f9ee02
Submodule qtquickcontrols2 updated: dff76611bc...63f73a2aee
Submodule qtremoteobjects updated: 0624860bcf...bfd4ed0f9a
2
qtscript
2
qtscript
Submodule qtscript updated: def57382aa...2ec32b5fdb
2
qtscxml
2
qtscxml
Submodule qtscxml updated: c307d59a3e...878112bf67
Submodule qtsensors updated: eb4ea7cee8...903ed99bcc
Submodule qtserialbus updated: f1ecfb23ae...dbddf24b08
Submodule qtserialport updated: 16dd2087f2...9431549e2e
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 8acc6db8ac...e5f94476d1
2
qtsvg
2
qtsvg
Submodule qtsvg updated: efa920382e...261ed79b96
2
qttools
2
qttools
Submodule qttools updated: 850e110146...1d665e7f4a
Submodule qttranslations updated: b2ceff197a...e281294aeb
Submodule qtvirtualkeyboard updated: 33c358e576...bb9fd3b992
Submodule qtwayland updated: d950d9fc77...971ed94adb
Submodule qtwebchannel updated: 0b4d40b7d9...7219a32c30
Submodule qtwebengine updated: 8060a6ab65...07fcac049e
Submodule qtwebglplugin updated: 3de83d62b5...954a898bea
Submodule qtwebsockets updated: 7ce1a6c286...4156135c23
Submodule qtwebview updated: 9cbb229a5c...14a616da97
Submodule qtwinextras updated: be49d3ffd3...9ec782f24f
Submodule qtx11extras updated: 122c4f7a98...be7f01d16d
Submodule qtxmlpatterns updated: 2350c3f037...2e532e96db
Reference in New Issue
Block a user