Compare commits

...

14 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
477af4ee90 Update submodules on '6.5.0 in qt/qt5'
Change-Id: Iecb3fd94037bb7f729b5c7a9b1415514833a4eb5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-29 02:23:03 +00:00
Qt Submodule Update Bot
9c918a66bf Update submodules on '6.5.0 in qt/qt5'
Change-Id: Ia6349e2483e356cdf0a67e4ab840ff2a0f35913d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-26 06:12:45 +00:00
Qt Submodule Update Bot
c0d3eec46a Update submodules on '6.5.0 in qt/qt5'
Change-Id: Iea21d050ba84c6b5151cb6e7715f6b9eb81adc81
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-25 13:08:54 +00:00
Qt Submodule Update Bot
4c8e9d4df8 Update submodules on '6.5.0 in qt/qt5'
Change-Id: I486dcf195e1ce81f5a9e10158f49645bae883e78
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-24 03:25:23 +00:00
Qt Submodule Update Bot
3aef423123 Update submodules on '6.5.0 in qt/qt5'
Change-Id: Ib6ca5e46c4bf96e9e11f632d415867a2f9004a2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-22 18:48:45 +00:00
Qt Submodule Update Bot
58186c83e9 Update submodules on '6.5.0 in qt/qt5'
Change-Id: Ib9f3d8f6f74b36e4c28d82bec7bb540f2c8bdbe9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-16 09:31:41 +00:00
Qt Submodule Update Bot
d967f3dd49 Update submodules on '6.5.0 in qt/qt5'
Change-Id: I51249e8b114f2035a8692f0d3696e5b87dadfe49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-11 14:19:00 +00:00
Qt Submodule Update Bot
81c96f6324 Update submodules on '6.5.0 in qt/qt5'
Change-Id: I8886013bc739928c18e00afc193e2524be84c3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-09 06:33:09 +00:00
Qt Submodule Update Bot
02c59150f4 Update submodules on '6.5.0 in qt/qt5'
Change-Id: Ided9d0345831ea0246095bb5c2b4e7f014aa6d55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-06 17:52:16 +00:00
Jani Heikkinen
73d7bba181 Adjust submodule branches
Change-Id: Ie1b773639839243a0c9ac2b5ba9f807b710e1dcc
2023-03-02 08:26:34 +02:00
Qt Submodule Update Bot
3166a0a7cf Update submodules on '6.5 in qt/qt5'
Change-Id: Ie24d26ec98f402e790ebc07cfafa303817db373e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-02 00:10:47 +00:00
Topi Reinio
4258273614 Provisioning: Update qdoc/qtattributionsscanner binaries on Ubuntu 22.04
The qdoc binary was originally built against libclang from LLVM 15, and
that version has problems parsing source code when C++20 support is
enabled.

Update to a version that is built against libclang from LLVM 12.

Fixes: QTBUG-111186
Change-Id: I068b3e6d4d006ba6e55e2144c0fdeaeada931b73
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6e0a189923)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-01 09:12:51 +00:00
Qt Submodule Update Bot
121aa7f72f Update submodules on '6.5 in qt/qt5'
Change-Id: I35780f48c30111e0ea89ceae6cd61084497cfa69
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-28 12:39:06 +00:00
Johanna Äijälä
d64669c50b Provisioning: add Android SDK, NDK and openSSL to Ubuntu22.04
Needed for RTA, for better coverage RTA uses Ubuntu as a host in Android
RTA tests.

Change-Id: I4670102bc865847f07dccc47ba56d09734e269cd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d5d0bd27f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-21 10:47:10 +00:00
47 changed files with 176 additions and 87 deletions

82
.gitmodules vendored
View File

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

View File

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

View File

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

View File

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

Submodule qt3d updated: ea5124c332...19945c3374

2
qtbase

Submodule qtbase updated: 3715cc3561...aea92807be

2
qtcoap

Submodule qtcoap updated: 7cc458e2c3...577ee0bd65

2
qtdoc

Submodule qtdoc updated: 650ff01a31...d6bdf2f881

2
qtgrpc

Submodule qtgrpc updated: bae7df8ce4...841f5aed35

2
qtmqtt

Submodule qtmqtt updated: b674697c5d...5c833ff317

Submodule qtopcua updated: dfc7efff89...347c2557a1

2
qtqa

Submodule qtqa updated: e8dcfb9ce4...5bf4bd9f10

Submodule qtscxml updated: a9fcf950e7...90c50da132

2
qtsvg

Submodule qtsvg updated: 99da136df9...276e202014

Submodule qttools updated: b37f3b41a4...e47c8899ef