Compare commits

...

7 Commits
6.5 ... v6.5.1

Author SHA1 Message Date
Jani Heikkinen
19b7e91751 Update qtqa submodule
Change-Id: Iac839a13e74606785e2f389335c321230c817c13
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2023-05-22 07:45:49 +03:00
Alexey Edelev
f504916373 Disable openssl for ffmpeg library
Openssl library causes backward compatibility issues. We need to disable
it to make ffmpegmediaplugin work on all supported linux platforms.

Fixes: QTBUG-113324
Change-Id: Ib266e2cf67e9336fb206735b8b2418fccd8f7b00
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e1b7e865ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-22 07:45:46 +03:00
Qt Submodule Update Bot
9ed14c6e5b Update submodules on '6.5.1 in qt/qt5'
Change-Id: Iad745182318d2d8d4a27bbb1e726b234c2198a16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-16 14:30:33 +00:00
Qt Submodule Update Bot
ef67ee6bf2 Update submodules on '6.5.1 in qt/qt5'
Change-Id: I48a8c53b44956439739c97d8de132f96e0f3fda4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-16 05:17:22 +00:00
Qt Submodule Update Bot
b7223e1020 Update submodules on '6.5.1 in qt/qt5'
Change-Id: I2dc5a8ec2502ff8d3352984277bb259b1fa0b946
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-15 08:48:12 +00:00
Qt Submodule Update Bot
aba066b01e Update submodules on '6.5.1 in qt/qt5'
Change-Id: I04d995181cbeebabe0a733c6fac21fb3e185ad9d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-11 20:22:55 +00:00
Jani Heikkinen
fc39898816 Adjust submodule branches
Change-Id: Ifff54a051ad262c5681c1c26d939b9958a0309d1
2023-05-02 08:06:45 +03:00
45 changed files with 84 additions and 85 deletions

82
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 6.5 branch = 6.5.1
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 6.5 branch = 6.5.1
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase qtshadertools depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d recommends = qtdeclarative qtquick3d
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt recommends = qtdeclarative qtactiveqt
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 6.5 branch = 6.5.1
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 6.5 branch = 6.5.1
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtshadertools qtwebengine recommends = qtmultimedia qtshadertools qtwebengine
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 6.5 branch = 6.5.1
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 6.5 branch = 6.5.1
status = preview status = preview
[submodule "qtpositioning"] [submodule "qtpositioning"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtserialport recommends = qtdeclarative qtserialport
path = qtpositioning path = qtpositioning
url = ../qtpositioning.git url = ../qtpositioning.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -117,61 +117,61 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtshadertools recommends = qtdeclarative qtshadertools
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtbase depends = qtbase
recommends = qtserialport recommends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning recommends = qtwebchannel qttools qtpositioning
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia recommends = qtmultimedia
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
@@ -219,27 +219,27 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml.git url = ../qtscxml.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtspeech path = qtspeech
url = ../qtspeech.git url = ../qtspeech.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtremoteobjects"] [submodule "qtremoteobjects"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtremoteobjects path = qtremoteobjects
url = ../qtremoteobjects.git url = ../qtremoteobjects.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtwebglplugin"] [submodule "qtwebglplugin"]
depends = qtbase qtwebsockets depends = qtbase qtwebsockets
@@ -252,80 +252,80 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtlottie path = qtlottie
url = ../qtlottie.git url = ../qtlottie.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtquicktimeline"] [submodule "qtquicktimeline"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtquick3d"] [submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline recommends = qtquicktimeline
path = qtquick3d path = qtquick3d
url = ../qtquick3d.git url = ../qtquick3d.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtshadertools"] [submodule "qtshadertools"]
depends = qtbase depends = qtbase
path = qtshadertools path = qtshadertools
url = ../qtshadertools.git url = ../qtshadertools.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qt5compat"] [submodule "qt5compat"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qt5compat path = qt5compat
url = ../qt5compat.git url = ../qt5compat.git
branch = 6.5 branch = 6.5.1
status = deprecated status = deprecated
[submodule "qtcoap"] [submodule "qtcoap"]
depends = qtbase depends = qtbase
path = qtcoap path = qtcoap
url = ../qtcoap.git url = ../qtcoap.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtmqtt"] [submodule "qtmqtt"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtmqtt path = qtmqtt
url = ../qtmqtt.git url = ../qtmqtt.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtopcua"] [submodule "qtopcua"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtopcua path = qtopcua
url = ../qtopcua.git url = ../qtopcua.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtlanguageserver"] [submodule "qtlanguageserver"]
depends = qtbase depends = qtbase
path = qtlanguageserver path = qtlanguageserver
url = ../qtlanguageserver.git url = ../qtlanguageserver.git
branch = 6.5 branch = 6.5.1
status = preview status = preview
[submodule "qthttpserver"] [submodule "qthttpserver"]
depends = qtbase depends = qtbase
recommends = qtwebsockets recommends = qtwebsockets
path = qthttpserver path = qthttpserver
url = ../qthttpserver.git url = ../qthttpserver.git
branch = 6.5 branch = 6.5.1
status = preview status = preview
[submodule "qtquick3dphysics"] [submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics path = qtquick3dphysics
url = ../qtquick3dphysics.git url = ../qtquick3dphysics.git
branch = 6.5 branch = 6.5.1
status = addon status = addon
[submodule "qtgrpc"] [submodule "qtgrpc"]
depends = qtbase depends = qtbase
path = qtgrpc path = qtgrpc
url = ../qtgrpc.git url = ../qtgrpc.git
branch = 6.5 branch = 6.5.1
status = preview status = preview
[submodule "qtquickeffectmaker"] [submodule "qtquickeffectmaker"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquick3d recommends = qtquick3d
path = qtquickeffectmaker path = qtquickeffectmaker
url = ../qtquickeffectmaker.git url = ../qtquickeffectmaker.git
branch = 6.5 branch = 6.5.1
status = addon status = addon

View File

@@ -138,7 +138,6 @@ build_ffmpeg_android() {
} }
if [ "$os" == "linux" ]; then if [ "$os" == "linux" ]; then
ffmpeg_config_options="$ffmpeg_config_options --enable-openssl"
build_ffmpeg build_ffmpeg
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"

2
qt3d

Submodule qt3d updated: 1ba5993e00...7da3c72367

2
qtbase

Submodule qtbase updated: 1c7a8abe84...55aee86975

2
qtcoap

Submodule qtcoap updated: 0db738e5f9...ec535750df

2
qtdoc

Submodule qtdoc updated: ff37fc1ff4...26943ca49c

2
qtgrpc

Submodule qtgrpc updated: 69987e8584...94446d021a

2
qtmqtt

Submodule qtmqtt updated: dd6ad2198a...4fe95ce910

Submodule qtopcua updated: b2125d622f...65b1bf9d2c

2
qtqa

Submodule qtqa updated: 0c48960efb...c7a2fff1e2

Submodule qtscxml updated: 730eed4610...0157667141

2
qtsvg

Submodule qtsvg updated: f59f7efa39...bc7b39eb4e

Submodule qttools updated: 638eb559a8...3b594e8043