Update to Qt 6.1 from dev branch

Change-Id: I8277f8071bd5378a323ef528fb968965ee3dfefe Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2026-01-04 16:10:12 +00:00 · 2020-12-15 09:06:25 +02:00 · 2020-12-15 09:06:25 +02:00 · 81b5375448
commit 81b5375448
parent aaa3b77573
25 changed files with 46 additions and 38 deletions
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
 PACKAGECONFIG[qtgamepad] = ",,qtgamepad"

 SRCREV_FORMAT = "qt3d_assimp"
-SRCREV_qt3d = "2ed189225580f49695560b59f4fe341da4444253"
+SRCREV_qt3d = "86eb86514e6b895827e9b73a3bccc057081a470f"
 SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
--- a/recipes-qt/qt6/qt5compat_git.bb
+++ b/recipes-qt/qt6/qt5compat_git.bb
@ -17,4 +17,4 @@ DEPENDS += "qtbase"

 PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"

-SRCREV = "46fd0963a547b7907f732324fd822abca3fec8d7"
+SRCREV = "d9f843df2efbe644cd3ec97e59fe7df9f7161c1c"
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/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.0.0"
+QT_MODULE_BRANCH ?= "dev"
 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}"
@ -11,4 +11,4 @@ CVE_PRODUCT = "qt"

 S = "${WORKDIR}/git"

-PV = "6.0.0"
+PV = "6.1.0"
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@ -147,4 +147,4 @@ FILES_${PN}-tools += "\

 BBCLASSEXTEND =+ "native nativesdk"

-SRCREV = "fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17"
+SRCREV = "df28d75721f7e57f4421ed8c4b8131da742f3967"
--- a/recipes-qt/qt6/qtcoap_git.bb
+++ b/recipes-qt/qt6/qtcoap_git.bb
@ -12,4 +12,4 @@ DEPENDS += "qtbase"

 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"

-SRCREV = "e3492d34c37af5e131c104d358cc9c1aade5c35c"
+SRCREV = "2b3abacd157da938be7409a8dbfd066782baf853"
--- a/recipes-qt/qt6/qtdeclarative_git.bb
+++ b/recipes-qt/qt6/qtdeclarative_git.bb
@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"

 BBCLASSEXTEND =+ "native nativesdk"

-SRCREV = "fa87052d56526e1529e694fb1c69c69eec38f2fd"
+SRCREV = "2f9e315fe71e43bc6de8dc9bc25c9cb7f5f5ae42"
--- a/recipes-qt/qt6/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt6/qtgraphicaleffects_git.bb
@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = " \

 inherit qt6-cmake

-QT_MODULE_BRANCH = "dev"
-
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

--- a/recipes-qt/qt6/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@ -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 = "0754fc911d2b441b19bf796ffcb8355619e34512"
+SRCREV = "6c832068a6749a334a3e7bf6d888d46dfd88e34b"
--- a/recipes-qt/qt6/qtmqtt_git.bb
+++ b/recipes-qt/qt6/qtmqtt_git.bb
@ -13,4 +13,4 @@ DEPENDS += "qtbase"

 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"

-SRCREV = "abc5e6875f3a31d82eee12d9c86140497b2e9b6b"
+SRCREV = "215f7380b9aae577b61670f66248fc08921a0adf"
--- a/recipes-qt/qt6/qtnetworkauth_git.bb
+++ b/recipes-qt/qt6/qtnetworkauth_git.bb
@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"

-SRCREV = "b0523c2519d97a352ef2cd78d82155d85453a5fd"
+SRCREV = "2a94f99492b2f8d27008d5932b8cac253ec14585"
--- a/recipes-qt/qt6/qtopcua_git.bb
+++ b/recipes-qt/qt6/qtopcua_git.bb
@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = ""

 DEPENDS += "qtbase"

-SRCREV = "7fd49429153f56b9f5c885299ab1ba42f2f34c5e"
+SRCREV = "f8b92c152e4dd89ef668dcaf5044cfabb896f264"
--- a/recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch
+++ b/recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch
@ -1,19 +1,36 @@
-From 2a86d7934907f8abc9f9d90885673532ba7a2d79 Mon Sep 17 00:00:00 2001
+From 4ac03bc85f99154dfcb4eda5c6b983e7d4dca6cd Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 28 Aug 2020 14:49:11 +0300
 Subject: [PATCH] CMake: allow tools build without opengl

 Change-Id: I76d750b5bd29103133578152241c11bc35b14552
 ---
+ CMakeLists.txt                 | 5 -----
 tools/balsam/CMakeLists.txt    | 1 -
 tools/meshdebug/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
+ 3 files changed, 7 deletions(-)

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4574c6d..ccae7f0a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -34,11 +34,6 @@ if(NOT TARGET Qt::Quick)
+ endif()
+ 
+ # special case begin
+-if(NOT TARGET Qt::OpenGL)
+-    message(NOTICE "Skipping the build as the condition \"TARGET Qt::OpenGL\" is not met.")
+-    return()
+-endif()
+-
+ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS ShaderTools)
+ # special case end
+ 
 diff --git a/tools/balsam/CMakeLists.txt b/tools/balsam/CMakeLists.txt
-index 55a090de..7b09f0b4 100644
+index 99002525..b308311d 100644
 --- a/tools/balsam/CMakeLists.txt
 +++ b/tools/balsam/CMakeLists.txt
-@@ -10,7 +10,6 @@ qt_add_tool(balsam
+@@ -11,7 +11,6 @@ qt_internal_add_tool(${target_name}
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Qml # special case
@ -22,10 +39,10 @@ index 55a090de..7b09f0b4 100644
         Qt::Quick3DAssetImportPrivate
 )
 diff --git a/tools/meshdebug/CMakeLists.txt b/tools/meshdebug/CMakeLists.txt
-index 18872bd7..e712b4d2 100644
+index 812155ef..b497e9a4 100644
 --- a/tools/meshdebug/CMakeLists.txt
 +++ b/tools/meshdebug/CMakeLists.txt
-@@ -10,7 +10,6 @@ qt_add_tool(meshdebug
+@@ -11,7 +11,6 @@ qt_internal_add_tool(${target_name}
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Qml # special case
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
 "

 SRCREV_FORMAT = "qtquick3d_assimp"
-SRCREV_qtquick3d = "af258ce11bc73540f1205dd13d7ed418c2c025bb"
+SRCREV_qtquick3d = "3499a8293064fb39b410b04cc199b1e1de969ab1"
 SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
--- a/recipes-qt/qt6/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt6/qtquickcontrols2_git.bb
@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS = "qtbase qtdeclarative"

-SRCREV = "9a19ec26f45e7382431f52136f03887cfaa04b66"
+SRCREV = "544fe3dcf5ce1f539c9d74ac23815268950b9212"
--- a/recipes-qt/qt6/qtquicktimeline_git.bb
+++ b/recipes-qt/qt6/qtquicktimeline_git.bb
@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS = "qtbase qtdeclarative"

-SRCREV = "3ca11a6edc751e7c413cd9e149dfc4dfe56b8981"
+SRCREV = "4afe215b9dcdb9f2c813c6e40d74b129a4185ce3"
--- a/recipes-qt/qt6/qtserialbus_git.bb
+++ b/recipes-qt/qt6/qtserialbus_git.bb
@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = " \

 inherit qt6-qmake

-QT_MODULE_BRANCH = "dev"
-
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

--- a/recipes-qt/qt6/qtserialport_git.bb
+++ b/recipes-qt/qt6/qtserialport_git.bb
@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = " \

 inherit qt6-qmake

-QT_MODULE_BRANCH = "dev"
-
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

--- a/recipes-qt/qt6/qtshadertools_git.bb
+++ b/recipes-qt/qt6/qtshadertools_git.bb
@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"

 BBCLASSEXTEND =+ "native nativesdk"

-SRCREV = "d3728dae58eca05bdac1f934ef981dd2bb6fa66a"
+SRCREV = "0a7bb105b78caab1019ee46e7c724b8a4b7f361c"
--- a/recipes-qt/qt6/qtspeech_git.bb
+++ b/recipes-qt/qt6/qtspeech_git.bb
@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = " \

 inherit qt6-qmake

-QT_MODULE_BRANCH = "dev"

 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
--- a/recipes-qt/qt6/qtsvg_git.bb
+++ b/recipes-qt/qt6/qtsvg_git.bb
@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"

-SRCREV = "608054063bf58c555a1871e0a4df9c329c3b6885"
+SRCREV = "8538de429db7c1d1623906d67ded6bbeabf36dd2"
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@ -14,6 +14,8 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase qtdeclarative qttools-native"

+FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
+
 BBCLASSEXTEND =+ "native nativesdk"

-SRCREV = "3fd594493c3ba31639a7515b901554456a90b4c7"
+SRCREV = "266b9fa04c65a00b45c7dc56fa205ff1388375d5"
--- a/recipes-qt/qt6/qttranslations_git.bb
+++ b/recipes-qt/qt6/qttranslations_git.bb
@ -18,4 +18,4 @@ python populate_packages_prepend () {
                      'Qt translations for %s', extra_depends='')
 }

-SRCREV = "00c3b3f8934a52a3a9999d8df8919b00baad116c"
+SRCREV = "1af3b4e79e9f34bf4ed910c3094b0d286044dd8b"
--- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = " \

 inherit qt6-cmake

-QT_MODULE_BRANCH = "dev"
-
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

@ -120,4 +118,4 @@ FILES_${PN} += "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/lipi_toolkit"

 DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"

-SRCREV = "84a790bad0ad171948cba02ef2f60559598ba36a"
+SRCREV = "516aeec45e2a43edde8b80369ca62156e27b7f5b"
--- a/recipes-qt/qt6/qtwayland_git.bb
+++ b/recipes-qt/qt6/qtwayland_git.bb
@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"

 BBCLASSEXTEND =+ "native nativesdk"

-SRCREV = "bd91a3fce0284c0ca410358b4a1bdb58b58e4ecb"
+SRCREV = "a724310684d421e66237fb61e3a1fe606fc45a65"
--- a/recipes-qt/qt6/qtwebsockets_git.bb
+++ b/recipes-qt/qt6/qtwebsockets_git.bb
@ -8,11 +8,9 @@ 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 qtdeclarative"

-SRCREV = "e861ee912cb633643fc49d26db960b652e6f3357"
+SRCREV = "6a6a7203f4e1856044181fb5db51f2f08388d127"