Compare commits

...

5 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
119192afa2 Update submodules on '6.2.3 in qt/qt5'
Change-Id: I8c854daac2b02ac18c720e85b57ca71ed9d0c4b4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-24 12:52:58 +00:00
Qt Submodule Update Bot
7cf5dc67b4 Update submodules on '6.2.3 in qt/qt5'
Change-Id: Iac2b6ed2497e69f0a88f5a67cd9294da89b4af1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-19 20:32:09 +00:00
Qt Submodule Update Bot
83eb2ab087 Update submodules on '6.2.3 in qt/qt5'
Change-Id: I9b0ef32e0a3e4bd6a9daa921bbf16f53e6955941
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-18 04:28:58 +00:00
Heikki Halmet
414e0cf85a Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it

Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 1e8939b4b2)
2022-01-12 13:36:04 +02:00
Jani Heikkinen
fa46120600 Adjust submodule branches
Change-Id: Ib9c2460e8f6d54ce262b95c5a5e4606f6ba25791
2022-01-11 08:35:34 +02:00
38 changed files with 79 additions and 79 deletions

80
.gitmodules vendored
View File

@@ -1,53 +1,53 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 6.2
branch = 6.2.3
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtimageformats qtshadertools qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 6.2
branch = 6.2.3
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtmultimedia"]
depends = qtbase qtshadertools
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 6.2
branch = 6.2.3
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 6.2
branch = 6.2.3
status = ignore
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 6.2
branch = 6.2.3
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia
path = qtdoc
url = ../qtdoc.git
branch = 6.2
branch = 6.2.3
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative
path = qtlocation
url = ../qtlocation.git
branch = 6.2
branch = 6.2.3
status = ignore
[submodule "qtpositioning"]
depends = qtbase
recommends = qtdeclarative qtserialport
path = qtpositioning
url = ../qtpositioning.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -117,183 +117,183 @@
recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = 6.2
branch = 6.2.3
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 6.2
branch = 6.2.3
status = ignore
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 6.2
branch = 6.2.3
status = ignore
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 6.2
branch = 6.2.3
status = ignore
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 6.2
branch = 6.2.3
status = ignore
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline
path = qtquick3d
url = ../qtquick3d.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = 6.2
branch = 6.2.3
status = deprecated
[submodule "qtcoap"]
depends = qtbase
path = qtcoap
url = ../qtcoap.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative
path = qtmqtt
url = ../qtmqtt.git
branch = 6.2
branch = 6.2.3
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative
path = qtopcua
url = ../qtopcua.git
branch = 6.2
branch = 6.2.3
status = addon

View File

@@ -66,6 +66,9 @@ sudo zypper -nq install p7zip
# EGL support
sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel
# ICU
sudo zypper -nq install libicu-devel libicu-suse65_1
# gtk3 style for QtGui/QStyle
sudo zypper -nq install gtk3-devel
@@ -76,9 +79,6 @@ sudo zypper -nq install libXi-devel postgresql13 postgresql13-devel mysql-devel
sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
xcb-util-wm-devel xcb-util-renderutil-devel
# ICU
sudo zypper -nq install libicu-devel libicu-suse65_1
# qtwebengine
sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \

2
qt3d

Submodule qt3d updated: 841500a515...f71e8bed39

2
qtbase

Submodule qtbase updated: 0c1479d6bd...4db05007d7

2
qtcoap

Submodule qtcoap updated: a10069228b...2a430f10f4

2
qtdoc

Submodule qtdoc updated: 350cf201d4...0bb382c02c

2
qtmqtt

Submodule qtmqtt updated: 22da9e9e92...ec7e6ec043

Submodule qtopcua updated: 3fa9fdf3bf...785e3ba03e

2
qtqa

Submodule qtqa updated: ec75d94c40...64ef404c74

Submodule qtscxml updated: a8a7b112c0...c897b9f68e

2
qtsvg

Submodule qtsvg updated: f91300ddd7...ddb1e497f1

Submodule qttools updated: 7cbc741365...d7f2fbf8f8