mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-27 02:15:59 +08:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
316776cd0e | ||
|
|
0b855fe713 | ||
|
|
c9d8ca917a | ||
|
|
f57648593c | ||
|
|
38a26d9f86 | ||
|
|
256644ac0d | ||
|
|
2bb4f34284 | ||
|
|
2df62f1f76 | ||
|
|
d0035f0360 |
72
.gitmodules
vendored
72
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,54 +252,54 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.3
|
||||
branch = 6.3.2
|
||||
status = preview
|
||||
|
||||
44
coin/provisioning/qtci-macos-12-x86_64/50-openssl_for_android_darwin.sh
Executable file
44
coin/provisioning/qtci-macos-12-x86_64/50-openssl_for_android_darwin.sh
Executable file
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 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"
|
||||
44
coin/provisioning/qtci-macos-12.0-arm/50-openssl_for_android_darwin.sh
Executable file
44
coin/provisioning/qtci-macos-12.0-arm/50-openssl_for_android_darwin.sh
Executable file
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 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"
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: cfaaad9d31...c1d37ff6c6
Submodule qt5compat updated: d011f63fdc...c2c72912f8
Submodule qtactiveqt updated: 6e54ce8efe...8581d21fcf
2
qtbase
2
qtbase
Submodule qtbase updated: b01dbbf24f...12dc1dc09d
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 7409246302...c48db5baec
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 3495a1bb26...68f0e5a56b
Submodule qtconnectivity updated: 2e4fd55a55...70cec60c9d
Submodule qtdatavis3d updated: 54721e6555...3d2a005e15
Submodule qtdeclarative updated: 4e6ee6cb94...9e53299b77
2
qtdoc
2
qtdoc
Submodule qtdoc updated: b43ffb9bac...5291801446
Submodule qtimageformats updated: 98b8e294b9...ec28a0ce38
Submodule qtlanguageserver updated: ef8e2d4bbd...41f9cbbea8
2
qtlottie
2
qtlottie
Submodule qtlottie updated: d551c0077c...c3738c7cc9
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: c0a0aad1d3...4883fd6b40
Submodule qtmultimedia updated: 0057005dd0...6073663796
Submodule qtnetworkauth updated: 59c9bad9e5...f090c54e4e
2
qtopcua
2
qtopcua
Submodule qtopcua updated: d0cfb197a2...c2cf00dafd
Submodule qtpositioning updated: e21552b350...f40ac70bcd
2
qtqa
2
qtqa
Submodule qtqa updated: ba49b17435...78b1a3390d
Submodule qtquick3d updated: 8fbad89710...7b900b5d61
Submodule qtquicktimeline updated: 778efac1c9...7f1a4217d4
Submodule qtremoteobjects updated: dd14656c3e...497508d444
2
qtscxml
2
qtscxml
Submodule qtscxml updated: ecddd7b87a...f447c4816b
Submodule qtsensors updated: 70e66bef4a...7aba25e2de
Submodule qtserialbus updated: 8091c443ac...ad1b46f305
Submodule qtserialport updated: a81c46954e...3cf0152472
Submodule qtshadertools updated: 4ffab510af...eee3f1abaa
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 4ff5938768...2c30a4b12c
2
qttools
2
qttools
Submodule qttools updated: d4e9efcb53...6d2ced2cc7
Submodule qttranslations updated: 222a220c51...30720bf26d
Submodule qtvirtualkeyboard updated: 4aba586585...9d48f200fd
Submodule qtwayland updated: 77679b847b...dc27dd02a6
Submodule qtwebchannel updated: 9d83e9a36a...9fc8b35639
Submodule qtwebengine updated: 8215acd3bb...ed4d0677fa
Submodule qtwebsockets updated: 0f6a35cc25...f69c3dae29
Submodule qtwebview updated: a4435cb856...fee843a1a2
Reference in New Issue
Block a user