mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-14 02:46:46 +08:00
Compare commits
14 Commits
v6.5.0-bet
...
6.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
477af4ee90 | ||
|
|
9c918a66bf | ||
|
|
c0d3eec46a | ||
|
|
4c8e9d4df8 | ||
|
|
3aef423123 | ||
|
|
58186c83e9 | ||
|
|
d967f3dd49 | ||
|
|
81c96f6324 | ||
|
|
02c59150f4 | ||
|
|
73d7bba181 | ||
|
|
3166a0a7cf | ||
|
|
4258273614 | ||
|
|
121aa7f72f | ||
|
|
d64669c50b |
82
.gitmodules
vendored
82
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,80 +252,80 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## 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 https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://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 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/linux/android_linux.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
|
||||
@@ -0,0 +1,45 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## 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 https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://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 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/openssl_for_android.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh"
|
||||
@@ -48,9 +48,8 @@ set -e
|
||||
"${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
|
||||
version="39fad60085501729985888d3f546c7b8d897a394"
|
||||
sha1="c66e3984cd647c8e32977dee72fe9d06f1b2ea28"
|
||||
|
||||
version="6781b63c31a3088b7029e272179be5765f8e61c7"
|
||||
sha1="096a80f0f01268aa239580c031753f7c23918438"
|
||||
url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"
|
||||
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: ea5124c332...19945c3374
Submodule qt5compat updated: 8a82aa5e35...50a78d8f17
Submodule qtactiveqt updated: 003e8872a5...1d1cce4581
2
qtbase
2
qtbase
Submodule qtbase updated: 3715cc3561...aea92807be
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 01d80b5246...720006a194
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 7cc458e2c3...577ee0bd65
Submodule qtconnectivity updated: 898df8f84b...9e72bbe795
Submodule qtdatavis3d updated: be815f9c6a...0da756a81f
Submodule qtdeclarative updated: 11a481301d...3238e18d6b
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 650ff01a31...d6bdf2f881
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: bae7df8ce4...841f5aed35
Submodule qthttpserver updated: a09a908a7c...774f043c4a
Submodule qtimageformats updated: 2724a5e793...55bab88828
Submodule qtlanguageserver updated: f8dc941a84...7d094478e1
Submodule qtlocation updated: dd58d6299e...5278743537
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 8788e53f60...4f203e8655
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: b674697c5d...5c833ff317
Submodule qtmultimedia updated: 34a32676f5...c618713d0f
Submodule qtnetworkauth updated: b7eb024dda...87db582c72
2
qtopcua
2
qtopcua
Submodule qtopcua updated: dfc7efff89...347c2557a1
Submodule qtpositioning updated: 077324f59e...6765596a40
2
qtqa
2
qtqa
Submodule qtqa updated: e8dcfb9ce4...5bf4bd9f10
Submodule qtquick3d updated: f58af2e151...3538ca27fb
Submodule qtquick3dphysics updated: e52845538e...653bc5f59a
Submodule qtquickeffectmaker updated: d524f7191f...84411f078b
Submodule qtquicktimeline updated: 216b0ad853...06739c8cb6
Submodule qtremoteobjects updated: f7da41786a...e49ed1e40a
Submodule qtrepotools updated: 00464833e2...5b67e21705
2
qtscxml
2
qtscxml
Submodule qtscxml updated: a9fcf950e7...90c50da132
Submodule qtsensors updated: 9eaa04a300...5bbb158d56
Submodule qtserialbus updated: cbc8780b8a...7d9948f832
Submodule qtserialport updated: c1e7fd9aa2...b85cf9bb4f
Submodule qtshadertools updated: 55ce17eb82...2a9f26b893
2
qtspeech
2
qtspeech
Submodule qtspeech updated: f22a9d4ccd...da317b9e1f
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 99da136df9...276e202014
2
qttools
2
qttools
Submodule qttools updated: b37f3b41a4...e47c8899ef
Submodule qttranslations updated: 561d5a709c...7bba6b36b5
Submodule qtvirtualkeyboard updated: 81ef5346df...2c85d7745d
Submodule qtwayland updated: f65e8537a8...d711c6a028
Submodule qtwebchannel updated: 2eae52d2e4...0fbbb1a2df
Submodule qtwebengine updated: ef68a145b7...98db685e1a
Submodule qtwebsockets updated: fe5ddf433f...5c92cce2f7
Submodule qtwebview updated: bc9345f49f...3332e0d238
Reference in New Issue
Block a user