Merge tag 'v6.2.10-lts' into lts-6.2

meta-qt6 v6.2.10-lts release

Change-Id: Ia607c1ed512f80394a896cb1b78b327d2424861b

README.md

@@ -12,9 +12,11 @@ URI: https://git.openembedded.org/meta-openembedded/
 Yocto version support
 ---------------------
 
-The branching of meta-qt6 layer follows Qt branching scheme, that is
-`dev` for the development branch, `6.x` for each minor release and
-`lts-6.x` for commercial LTS releases.
+The branching of meta-qt6 layer follows [Qt branching scheme](https://wiki.qt.io/Branch_Guidelines),
+that is `dev` for the development branch, `6.x` for minor stabilization branches,
+`6.x.y` for the release branches and `lts-6.x.y` for commercial LTS releases.
+
+Each Qt release is tagged either as `v6.x.y` or `v6.x.y-lts`
 
 Following table shows the Yocto branches which are used to test each
 Qt version (x) and any additional Yocto releases that are stated in

conf/layer.conf

@@ -14,6 +14,11 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# bbappends for optional layers
+BBFILES_DYNAMIC += " \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
+"
+
 BBFILE_COLLECTIONS += "qt6-layer"
 BBFILE_PATTERN_qt6-layer := "^${LAYERDIR}/"
 
@@ -39,7 +44,7 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.2.9"
+QT_VERSION = "6.2.10"
 
 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"

dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend

@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qt6-git.inc

@@ -2,7 +2,7 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des
 HOMEPAGE ?= "https://www.qt.io"
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "6.2.9"
+QT_MODULE_BRANCH ?= "6.2.10"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
@@ -16,46 +16,46 @@ PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
 
-SRCREV_tqtc-qmlcompilerplus = "e8f45cbb4097b8552563e4879363d5c4f85776c9"
-SRCREV_tqtc-qtinsighttracker = "357f392d996cdc163e11796405cc873cdff01cbf"
-SRCREV_qt3d = "6f46f66f5224d07ba8f2579d1877d33b19cff233"
+SRCREV_tqtc-qmlcompilerplus = "3433157d17ef5e8fc26fd376a6dfa2651224397f"
+SRCREV_tqtc-qtinsighttracker = "0a573a88fbe23a4344745a92a4245f6db74e395f"
+SRCREV_qt3d = "77f759192da3bd95c972f1ed76f3db5060be1858"
 SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qt5compat = "80c717e50c67ebac3f75c94adf804ad135ef93c0"
-SRCREV_qtbase = "f131837a9fcc83dcfb70a0a91b1baacb6ccf14a2"
-SRCREV_qtapplicationmanager = "70d5140e4ad35ed59a2e665d132601b3d9cdac74"
-SRCREV_qtcharts = "074caa74898b1d5423bb7bea1d159fc27a63311b"
-SRCREV_qtcoap = "631d45eb7730f1bc90d53e7a86869a2d7cb2db6e"
-SRCREV_qtconnectivity = "55f8dee69bd5599a351d99f29662d26d8168c222"
-SRCREV_qtdatavis3d = "42fb6f15041c590fd8945325beb95a546207069a"
-SRCREV_qtdeclarative = "a1b4a68d1165115779ac925f43847a5735671917"
-SRCREV_qtdeviceutilities = "80f623ad26da2299ad03f87efc418de351130051"
-SRCREV_qtimageformats = "a9b81ef5a5e38002fc45ce3aa24756b660cd1f70"
-SRCREV_qtinterfaceframework = "5c5a9966e1f8476e59554293fd27d3f21a32d152"
-SRCREV_qtlottie = "cbadf5d2311e19c97e074fd37c6bd26525e752e8"
-SRCREV_qtmqtt = "7cc945adaa3876b5c67294615421034556c4d331"
-SRCREV_qtmultimedia = "034f7a6dadf48e51d58fecba5c6158c10dc3d4f3"
-SRCREV_qtnetworkauth = "8867b49ab6ca077e374a2116117e9bb96490f685"
-SRCREV_qtopcua = "6eb8763fae61f89d2402287ebe1580d6438107a8"
-SRCREV_qtpositioning = "17bde3b93354f8d706ccfa7077f278e8d6d4c2f7"
-SRCREV_qtquick3d = "1700b5d26d40cf36b99f1481fd516f15e8f0aa71"
+SRCREV_qt5compat = "f91d1dfcd34e75e91f2052e77e87f70724fac78f"
+SRCREV_qtbase = "8d7d8b9bbc72e612c18815cca0fdeb0539c9c1a7"
+SRCREV_qtapplicationmanager = "4c7e4812fc44f95d93742cc5218f61b856fd0a3f"
+SRCREV_qtcharts = "5bc575525c782682b59ccaf26979cfca2258b6cd"
+SRCREV_qtcoap = "fa1786654c1bba0759b41d45592ff36af183bac4"
+SRCREV_qtconnectivity = "dc6fed89e18242b0406044ad615b34320236e45e"
+SRCREV_qtdatavis3d = "44abd1ee5daff67dc1acc9248abaae2caa7e0f0c"
+SRCREV_qtdeclarative = "33e04685b27fc887dea2f71dbdf23850febc54dd"
+SRCREV_qtdeviceutilities = "8e0570e9a24ed2051764ad4ce20200f974bf2913"
+SRCREV_qtimageformats = "e14870c7268408e4cbffafcbe4eb34f97d5295c2"
+SRCREV_qtinterfaceframework = "4f8369a499e936c43dc4104a021c7abf11727832"
+SRCREV_qtlottie = "b448acb06ad382bff244ba4dd929b5768fe38206"
+SRCREV_qtmqtt = "25fcf871f3cbe6817235239768ae7fce90281bf2"
+SRCREV_qtmultimedia = "68e369153a92a9fcc2f69af741e3564e9752885d"
+SRCREV_qtnetworkauth = "d24e85c96c5131e059f1519d7d804d2ff8a6b337"
+SRCREV_qtopcua = "40594b3c28106d9f9b9efdad887b9d98e1c90034"
+SRCREV_qtpositioning = "3b5a88ccf4cd85c00346664cff8bf2b02740378f"
+SRCREV_qtquick3d = "d0d69efe8a7ae4cc1ec8ba1579dca9bc3dea0ca3"
 SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qtquickdesigner-components = "830119d8fc87408dbd5ec784bd8c96d290680ae1"
-SRCREV_qtquicktimeline = "9020b6861f727ed82825366a4da731e4f4f0c0e6"
-SRCREV_qtremoteobjects = "17df7329c8b1997977266452baca06a82a28bb55"
-SRCREV_qtscxml = "6fb7968cf96e3ebfefc7671976cef9873eca3c33"
-SRCREV_qtsensors = "2eee80371755b83b6c8de2df33496f585ff2e39b"
-SRCREV_qtserialbus = "c5ff08bc4580ee2738a47822305793b670efca38"
-SRCREV_qtserialport = "d1aa705a4f3e1000fd136a7295ce8ae0aff479fc"
-SRCREV_qtshadertools = "c0efa3c44c056e1307e25ad8f3dd6db6f19ef135"
-SRCREV_qtsvg = "21a1c892e0cabdd9161d87efa815145ddc3f7f70"
-SRCREV_qttools = "b84d5a96ee7cfa4a69d4963c771b230613224a15"
+SRCREV_qtquickdesigner-components = "62998be504e483575b8b54586851b26f38773aaa"
+SRCREV_qtquicktimeline = "32f0b7683809badd99b5227476ff83f72255a6db"
+SRCREV_qtremoteobjects = "18261c10429387a4b6f00e497c577ec464066c62"
+SRCREV_qtscxml = "dc5fdfe00901ef725f3282f9b8f799a666bbaf7f"
+SRCREV_qtsensors = "a05c8605cd03d497f4cb14da940cc5c9c053bb61"
+SRCREV_qtserialbus = "63048208476e3e4a49e143e4826b93563807b6bc"
+SRCREV_qtserialport = "6482eb8ad1600de4df1c620bfdfa8949e7d91f18"
+SRCREV_qtshadertools = "219736208b92b3f12749bc1edf10cc75639842e4"
+SRCREV_qtsvg = "908aa16c002af8f9762e2239171923f8d2bbe38f"
+SRCREV_qttools = "5488805ddde346063058dc8746d08126235fb850"
 SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38"
 SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01"
-SRCREV_qttranslations = "ad4139592ef3de9f88d32f350aa0e54b2c551cd5"
-SRCREV_qtvirtualkeyboard = "f86f467f5e0dec0661043fd034dd02d4fd8a7a25"
-SRCREV_qtwayland = "caa691d82b42a30c7caabcdcd5e67bab3709cac5"
-SRCREV_qtwebchannel = "bf6ea7cf2ada25f52bdd9aba02c69f51b1c437be"
-SRCREV_qtwebengine = "38063a6332b9f948a0381763271e9a9ac7af0999"
-SRCREV_qtwebengine-chromium = "08741ef38efb3754c1f244ea175d5a4c98b69fa2"
-SRCREV_qtwebsockets = "1d72e1a70b27e84a0bcbe7ed1e50462f8836f3e7"
-SRCREV_qtwebview = "6c10ff7ace6e5d7637a30bbea5b663c8cbe42371"
+SRCREV_qttranslations = "215525b3fe249a8779eb2f5a6db14358a7bb42b4"
+SRCREV_qtvirtualkeyboard = "cf21c7e3cf8297081f13fd348cd89939469a1664"
+SRCREV_qtwayland = "9662dc59119c88663a2741fe0943a57f247034c1"
+SRCREV_qtwebchannel = "3a7af7c8dbd953d38f59d975111e44137c1323fa"
+SRCREV_qtwebengine = "13381ca9e80578d038835c8a4dc609d75dfdec4c"
+SRCREV_qtwebengine-chromium = "ef090c47d08c734ae2b3c1db508982aca0f3ee1e"
+SRCREV_qtwebsockets = "99d2dd77af4af0fd86bff820dd154906b67a4837"
+SRCREV_qtwebview = "8be5f7ba4b359d95aab1cbb2c3c05064b69bf127"

recipes-qt/qt6/qt6.inc

@@ -127,3 +127,4 @@ FILES:${PN}-examples = " \
     ${QT6_INSTALL_EXAMPLESDIR} \
     ${prefix}/examples \
 "
+RDEPENDS:${PN}-examples = "${PN}"

recipes-qt/qt6/qtbase_git.bb

@@ -181,7 +181,7 @@ EOF
 
 do_install:append:class-target() {
     sed >> ${D}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf <<EOF \
-        -e 's:${lcl_maybe_fortify}::' \
+        -e 's: ${lcl_maybe_fortify}: :' \
         -e 's:${DEBUG_PREFIX_MAP}::' \
         -e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
         -e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:'

recipes-qt/qt6/qtinsighttracker_git.bb

@@ -10,3 +10,8 @@ include recipes-qt/qt6/qt6-commercial.inc
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
 FILES:${PN} += "${QT6_INSTALL_DATADIR}/qtinsight"
+
+# error: unexpected reloc 3 against global symbol qt_version_tag without base register
+# in object file when generating a position-independent output file
+QT_PTEST_ENABLED:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '0', \
+    bb.utils.contains('DISTRO_FEATURES', 'ptest', '1', '0', d), d)}"

recipes-qt/qt6/qtshadertools_git.bb

@@ -9,6 +9,10 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtshadertools-native"
+DEPENDS:append:class-native = " spirv-tools-native"
+
+RDEPENDS:${PN}-tools = "spirv-tools"
+RDEPENDS:${PN}-tools:remove:mingw32 = "spirv-tools"
 
 BBCLASSEXTEND = "native nativesdk"
 

recipes-qt/qt6/qttools_git.bb

@@ -19,6 +19,8 @@ SRC_URI += " \
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
 
+PACKAGECONFIG[clang] = "-DFEATURE_clang=ON,-DFEATURE_clang=OFF,clang"
+
 FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
 
 BBCLASSEXTEND = "native nativesdk"