CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt6: update submodules

Browse Source 
Update to latest content in Qt 6.0 branch (new Qt 6.0.1 RC).

Task-number: QTBUG-89461
Change-Id: I1a593c415c6803740ffcac8d6b6c02eaa67635d3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Mikko Gronoff 2021-01-20 13:55:32 +02:00
parent c3b78b9fc5
commit 04b1141046
18 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt6/qt3d_git.bb
View File

@ -14,7 +14,7 @@ include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += " \
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=upstream/assimp_5.0_release;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
"
DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "c44928d3c1abc52cea9910db6277eaeafe2df989"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_qt3d = "ee73f6a733fa5975f77e9c538bd48fd3eaf0a22d"
SRCREV_assimp = "d71020db155e9b2d4dba5562c980c016cde77f4c"

2
recipes-qt/qt6/qt5compat_git.bb
View File

@ -17,4 +17,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
SRCREV = "458fad58c81659d0a2677e0da8676af6f07c2483"
SRCREV = "7e2ff354d07499ac605ea6534769fc73b8659922"

10
recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
View File

@ -1,8 +1,8 @@
From fd50da53d4de86fe3a9e3eca24a7ae3e5c0f53fa Mon Sep 17 00:00:00 2001
From a1b732615a5b4f9149bac57443df0fedf39abb78 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
Subject: [PATCH 2/3] qlibraryinfo: allow to set qt.conf from the outside using
the environment
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
environment
Allow to set a qt.conf from the outside using the environment. This allows
to inject new prefixes and other paths into qmake. This is needed when using
@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index c8c7c0bf9b..90e81d0990 100644
index bb1eafeccd..0008fee675 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -183,7 +183,10 @@ void QLibrarySettings::load()
@ -32,6 +32,6 @@ index c8c7c0bf9b..90e81d0990 100644
+ QString qtconfig = QFile::decodeName(config);
+ if(qtconfig.isEmpty() || !QFile::exists(qtconfig))
+ qtconfig = qmake_libraryInfoFile();
if (QFile::exists(qtconfig))
if (!qtconfig.isEmpty())
return new QSettings(qtconfig, QSettings::IniFormat);
#else

2
recipes-qt/qt6/qtbase_git.bb
View File

@ -148,4 +148,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "5b3dbd38ca7685368c878dabcffeef2c3339711a"
SRCREV = "32734f351b076b8774c490c27ef18ddd2243dcaf"

2
recipes-qt/qt6/qtcoap_git.bb
View File

@ -12,4 +12,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
SRCREV = "1f9e34572f033d2a12069d53ee9bcef12caab775"
SRCREV = "b7709417b528c71e1ede1ac0e28d7fae14d2aada"

2
recipes-qt/qt6/qtdeclarative_git.bb
View File

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "367a781854ff4d4bcc0fb84c2d45278e92a7369e"
SRCREV = "476c07e3c3b1a0b11f9080ef0ee55d368c597d34"

2
recipes-qt/qt6/qtimageformats_git.bb
View File

@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
SRCREV = "bc755b3bab23d5019f67612e452934adab943045"
SRCREV = "6079dc310e308bdec501432ddd1c167d18071960"

2
recipes-qt/qt6/qtmqtt_git.bb
View File

@ -13,4 +13,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
SRCREV = "a526c6f63cd4b8a69710ee3b4df69159a683ef3b"
SRCREV = "7f164d3a8226a5e8ae98690d976943249f3b5545"

2
recipes-qt/qt6/qtnetworkauth_git.bb
View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "f9b2e90ee15864ff2a5c366b75a83fd226b38c6c"
SRCREV = "7b37c2ce0c0439ae999d419c4ffb4a33e6c999ae"

2
recipes-qt/qt6/qtopcua_git.bb
View File

@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "a712382b1e13027bca40443fa0cd64d4a1f544f0"
SRCREV = "39daa7e80d53b7913350f7c9694d6b55e3cb5ca1"

6
recipes-qt/qt6/qtquick3d_git.bb
View File

@ -9,7 +9,7 @@ include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += " \
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=upstream/assimp_5.0_release;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
file://0001-CMake-allow-tools-build-without-opengl.patch \
"
@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "542a1defe0cf44658a25db78cabf1d40227b254d"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_qtquick3d = "2dae4717945863b886a30f2e69839d4d344ba9c4"
SRCREV_assimp = "d71020db155e9b2d4dba5562c980c016cde77f4c"

2
recipes-qt/qt6/qtquickcontrols2_git.bb
View File

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "aec9ccf96524e3a8056076b434692e48d38fbb61"
SRCREV = "ee247716fa9c7d32cc94d2459b7c94b00dad0ffe"

2
recipes-qt/qt6/qtquicktimeline_git.bb
View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "004ea5e15c432abfe1b4bc280a7a4904e25177d8"
SRCREV = "f69f2e8f0953cc5e71177d2ed901b8395b4d63a1"

2
recipes-qt/qt6/qtshadertools_git.bb
View File

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "b20da34aedd1e43a891c37d606cede8b0d4c28b4"
SRCREV = "1fbfefd59cb8c1091db9dcd5fd0a27bf8171dcb8"

2
recipes-qt/qt6/qtsvg_git.bb
View File

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "231ac80690701d2ee110966a2344f13b72cc2e96"
SRCREV = "696f639aea75e061aef1b9bbc030c39ac16ae24e"

2
recipes-qt/qt6/qttools_git.bb
View File

@ -18,4 +18,4 @@ FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "207a398d31f1d0414e258f13b1774681bc67f06c"
SRCREV = "621561eaaa262157936ee9253eb7000f0e19c0eb"

2
recipes-qt/qt6/qttranslations_git.bb
View File

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "7cff3ec123c43f9bcb97acc79976c39497332a39"
SRCREV = "8aaa3ae7797de34d99d87c9b03375c77deaa1185"

2
recipes-qt/qt6/qtwayland_git.bb
View File

@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "6ce1b9e9f4aa4d6c98836bd12a24dd57b35cf5f6"
SRCREV = "7d646d952fb47daa35c62964c8b6090d2f78bced"