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 proposed Qt 6.0.0 RC content
- Set dev branch for non-official qt6 modules
- Re-enable qtopcua module

Task-number: QTBUG-86349
Change-Id: Ibb1a15796e572fe2407ba436c0d2b318a0be9352
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Mikko Gronoff 2020-11-19 09:46:22 +02:00
parent 4246a8afaa
commit 4ee65d5e60
25 changed files with 41 additions and 1471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1451
recipes-qt/qt6/qt3d/0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch
View File

File diff suppressed because it is too large Load Diff

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

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
inherit features_check
QT_MODULE_BRANCH = "dev"
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
@ -15,7 +16,6 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += " \
git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
file://0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch \
"
DEPENDS = "qtbase qtdeclarative qtshadertools-native"
@ -26,5 +26,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "9e2770d8995aedb07c517dd31395c8bb3a605def"
SRCREV_qt3d = "34e3fa58dcd1b746e0f890b6a78823f8cfee9b12"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

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 = "a919ad565e95e0c3eda930fd7b4d727018ff585a"
SRCREV = "af8c19b547442f4866272dc2819f300414996684"

4
recipes-qt/qt6/qt6-git.inc
View File

@ -2,8 +2,8 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des
HOMEPAGE ?= "https://www.qt.io"
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "dev"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
QT_MODULE_BRANCH ?= "6.0.0"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"

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

@ -144,4 +144,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d8efe51303a08e93240766c620d2a7be3df0dd04"
SRCREV = "510186a218e63c88100efc38cb1611f122f94570"

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

@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "39065e1cecdeb3f13917d48ff6381ffd6bcfc52f"
SRCREV = "4a6e30dbf730d17d39c88806ccee1012ff5761cc"

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

@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

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

@ -13,9 +13,11 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "bccce15a15a4168c75de545732e43d7f80d0e205"
SRCREV = "9b0b68488ac75668da339bdcd1ab358db03f2932"

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

@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
@ -13,4 +15,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DBUILD_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
SRCREV = "5735946c279d9bc07f9fa16be025726f4855aaa0"
SRCREV = "841b2de545466c8f9306a599d7b1b9647c2711d0"

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

@ -6,9 +6,11 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "3a904f1a17fd66ea28c8aa8b7a3da922c40b9de7"
SRCREV = "3b18f76f21ae901b8a2beb42bd32bfdc2b8c9ab9"

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

@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = " \
"
inherit qt6-cmake
inherit disable-build
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
@ -22,4 +23,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "c228f1fa0cc09a6c0d147e4fa9ea751b0ad599a8"
SRCREV = "65c13447a503f01d6a8bdf6cff8967d14fb3cf89"

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

@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "877ab0a41a2472b59ea1cd3eddcc30c70e3027e1"
SRCREV_qtquick3d = "7bbcb54c16526682e937c1a9394f258bf1c0bb43"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

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

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

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "5e4fa9054ed08c4dad01c1fd3d7ac83f1aea3c82"
SRCREV = "5dbc034d4a7a894f39f5679cd080fdfcea0be7a9"

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

@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-qmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

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

@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-qmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

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

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "bd39a1c9744dffb234c37a60549d0e0da3d5171e"
SRCREV = "2a9f9ffd5c93926d1b1faf89d668c8c898d21e17"

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

@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-qmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "4539d62e1c5d6389da53c1c788518ea2b8c5f0dc"
SRCREV = "93c0abc3b665ec4941ef1ba4b68d5e7947cc28a5"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "0cfb6d067b7dc7ccf5ad5247e9722ca8e7eff13a"
SRCREV = "4fdc343817de03fcf32c6bc3fe2f6b7807150b33"

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

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "5922361002a96d59d9b38121ac3aa0b095528ad2"
SRCREV = "9d0266a5da57df7ee58070f34084b9cb5bdf5fe7"

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

@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

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 = "cdf0dcb42096c865ca7ad25a3e7f1e6f71010f34"
SRCREV = "7643307b06b5f14e1984c54d1da9eb571280b208"

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

@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc