Compare commits

...

6 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
d94fd443b6 Update submodules on '5.12.10' in qt/qt5
Change-Id: If00a7a8230ef9e8a618fccd65e06231f16e99e9c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-04 05:20:25 +00:00
Qt Submodule Update Bot
83d940842c Update submodules on '5.12.10' in qt/qt5
Change-Id: Idedfde0d4bac6afd3fc71697d4584d9b5337ce55
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-10-29 11:36:08 +00:00
Qt Submodule Update Bot
5467b00de4 Update submodules on '5.12.10' in qt/qt5
Change-Id: I6c2b291aaaffb74e6a57763540382321c9db1a8d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-10-26 05:12:17 +00:00
Heikki Halmet
9616544a55 Provisioning: Enable access to SMB server in Windows 10 x64
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 586856e180)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-10-22 05:10:11 +00:00
Heikki Halmet
01752b6e21 Provisioning: Install Microsoft Visual C++ Redistributable
Script will install  Microsoft Visual C++ Redistributable for
Visual Studio 2015, 2017 and 2019

Change-Id: I4366855c8d5679e3b7b201d79a82e47199b3ad8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-10-22 08:10:06 +03:00
Jani Heikkinen
13b721c62d Adjust submodule branches
Change-Id: Icd14fca8be320e3d606d88f7bd441324712e558c
2020-10-14 10:13:35 +03:00
44 changed files with 131 additions and 81 deletions

80
.gitmodules vendored
View File

@@ -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

View File

@@ -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

View File

@@ -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

Submodule qt3d updated: 648daeb819...c9d86b593e

2
qtbase

Submodule qtbase updated: 991fb57e78...c919fc5f65

2
qtdoc

Submodule qtdoc updated: a4e9fea17e...e10560e0e3

2
qtqa

Submodule qtqa updated: bb9309475c...bc1b16f51b

Submodule qtscxml updated: c307d59a3e...878112bf67

2
qtsvg

Submodule qtsvg updated: efa920382e...261ed79b96

Submodule qttools updated: 850e110146...1d665e7f4a