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 beta1 content
* In qt3d & qtquick3d recipes, revert assimp submodule
  to official beta1 revision
* cleanup unused patches

Task-number: QTBUG-86349
Change-Id: Ib8d290cd9f6689e3863a0247d74ce5f19d7cec2c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Mikko Gronoff 2020-10-13 13:01:05 +03:00
parent 10bd7c69eb
commit 59024d081c
20 changed files with 14 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "48f3f9cc59e5fa6e410cb5424429cac2b37e09da"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_qt3d = "dd698034fd191807a1c02fd49c8cc87ec61d5b44"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

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

@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6-git.inc
DEPENDS += "qtbase"
SRCREV = "7b1acc282eb606364bf12cebd1f8956019267a73"
SRCREV = "d2ddabc91b49ec23ad9ac5e66c6a94ef4671a36b"

120
recipes-qt/qt6/qtbase/0001-CMake-enable-egl_viv-plugins.patch
View File

@ -1,120 +0,0 @@
From fe20227639b2bacdb35237754c821632707d87db Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 2 Oct 2020 11:16:34 +0300
Subject: [PATCH] CMake: enable egl_viv plugins
Add needed define for egl_viv compile test and generate CMakeLists
for the egl_viv plugins.
Task-number: QTBUG-77809
Change-Id: I3b354faee36cbb85adcee895430eb5e8998108e1
---
src/gui/configure.cmake | 2 ++
.../eglfs/deviceintegration/CMakeLists.txt | 4 +--
.../eglfs_viv/CMakeLists.txt | 27 +++++++++++++++++
.../eglfs_viv_wl/CMakeLists.txt | 29 +++++++++++++++++++
4 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
create mode 100644 src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 52da746d4d..40bf652f43 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -278,6 +278,8 @@ qt_config_compile_test(egl_viv
LABEL "i.Mx6 EGL"
LIBRARIES
EGL::EGL
+ COMPILE_OPTIONS # special case
+ "-DEGL_API_FB=1" # special case
CODE
"
#include <EGL/egl.h>
diff --git a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt
index 7ddcb8993f..827bb51fd3 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt
@@ -22,13 +22,13 @@ if(QT_FEATURE_eglfs_mali)
# add_subdirectory(eglfs_mali) # special case TODO
endif()
if(QT_FEATURE_eglfs_viv)
- # add_subdirectory(eglfs_viv) # special case TODO
+ add_subdirectory(eglfs_viv)
endif()
if(QT_FEATURE_eglfs_rcar)
# add_subdirectory(eglfs_rcar) # special case TODO
endif()
if(QT_FEATURE_eglfs_viv_wl)
- # add_subdirectory(eglfs_viv_wl) # special case TODO
+ add_subdirectory(eglfs_viv_wl)
endif()
if(QT_FEATURE_eglfs_openwfd)
# add_subdirectory(eglfs_openwfd) # special case TODO
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
new file mode 100644
index 0000000000..72952c6c5d
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from eglfs_viv.pro.
+
+#####################################################################
+## QEglFSVivIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QEglFSVivIntegrationPlugin
+ OUTPUT_NAME qeglfs-viv-integration
+ TYPE egldeviceintegrations
+ SOURCES
+ qeglfsvivintegration.cpp qeglfsvivintegration.h
+ qeglfsvivmain.cpp
+ DEFINES
+ EGL_API_FB=1
+ LINUX=1
+ INCLUDE_DIRECTORIES
+ ../../api
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::CorePrivate
+ Qt::EglFSDeviceIntegrationPrivate
+ Qt::Gui
+ Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:eglfs_viv.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs_viv.json"
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
new file mode 100644
index 0000000000..269bdde02c
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from eglfs_viv_wl.pro.
+
+#####################################################################
+## QEglFSVivWaylandIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QEglFSVivWaylandIntegrationPlugin
+ OUTPUT_NAME qeglfs-viv-wl-integration
+ TYPE egldeviceintegrations
+ SOURCES
+ qeglfsvivwlintegration.cpp qeglfsvivwlintegration.h
+ qeglfsvivwlmain.cpp
+ DEFINES
+ EGL_API_FB=1
+ LINUX=1
+ INCLUDE_DIRECTORIES
+ ../../api
+ LIBRARIES
+ Wayland::Server
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::CorePrivate
+ Qt::EglFSDeviceIntegrationPrivate
+ Qt::Gui
+ Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:eglfs_viv_wl.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs_viv_wl.json"

47
recipes-qt/qt6/qtbase/0001-CMake-set-default-eglfs-device-integration-plugin.patch
View File

@ -1,47 +0,0 @@
From 00b272026f528c47a8c5fe69ddff59d381a67037 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 2 Oct 2020 13:41:33 +0300
Subject: [PATCH] CMake: set default eglfs device integration plugin
Use QT_QPA_DEFAULT_EGLFS_INTEGRATION for setting the default eglfs
device integration plugin, which can be overwritten at runtime using
QT_QPA_EGLFS_INTEGRATION environment variable.
Change-Id: I1c3ac0c58cdbbb7bb08c2f0ea5abe4d04eb8d61a
---
src/plugins/platforms/eglfs/CMakeLists.txt | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 00b24aa03c..81b53ee234 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -1,5 +1,19 @@
# Generated from eglfs.pro.
-qt_find_package(EGL) # special case
+# special case begin
+qt_find_package(EGL)
+
+if(QT_FEATURE_eglfs_gbm)
+ set(_device_integration "eglfs_kms")
+elseif(QT_FEATURE_eglfs_egldevice)
+ set(_device_integration "eglfs_kms_egldevice")
+elseif(QT_FEATURE_eglfs_viv)
+ set(_device_integration "eglfs_viv")
+elseif(QT_FEATURE_eglfs_brcm)
+ set(_device_integration "eglfs_brcm")
+endif()
+
+set(QT_QPA_DEFAULT_EGLFS_INTEGRATION "${_device_integration}" CACHE STRING "Default EGLFS device integration plugin")
+# special case end
#####################################################################
## EglFSDeviceIntegration Module:
@@ -18,6 +32,7 @@ qt_internal_add_module(EglFSDeviceIntegration
DEFINES
QT_BUILD_EGL_DEVICE_LIB
QT_EGL_NO_X11
+ EGLFS_PREFERRED_PLUGIN=${QT_QPA_DEFAULT_EGLFS_INTEGRATION} # special case
INCLUDE_DIRECTORIES
api
PUBLIC_LIBRARIES

29
recipes-qt/qt6/qtbase/0001-CMake-use-HostInfo-when-QT_HOST_PATH-is-set.patch
View File

@ -1,29 +0,0 @@
From b376f8b9eb453379cc272282d2dbbe3f18827c60 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 29 Sep 2020 11:37:19 +0300
Subject: [PATCH] CMake: use HostInfo when QT_HOST_PATH is set
HostInfo is used in places whenever QT_HOST_PATH is set, regardless
whether CMAKE_CROSSCOMPILING is set or not. Make sure that HostInfo
is available when QT_HOST_PATH is set.
Change-Id: I39763a61d77e97dc9c4cc3875bce4deb942f870a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
cmake/QtSetup.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
index 04bb41f0c0..c0dbdca416 100644
--- a/cmake/QtSetup.cmake
+++ b/cmake/QtSetup.cmake
@@ -168,6 +168,9 @@ if (CMAKE_CROSSCOMPILING)
if(NOT IS_DIRECTORY "${QT_HOST_PATH}")
message(FATAL_ERROR "You need to set QT_HOST_PATH to cross compile Qt.")
endif()
+endif()
+
+if(QT_HOST_PATH)
find_package(Qt${PROJECT_VERSION_MAJOR}HostInfo
CONFIG
REQUIRED

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

@ -136,4 +136,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "56af9fb917b811a4e98c92364c6953f7f58adc45"
SRCREV = "b83225fcc3c6aa5655884cbf9e7391afe38b4392"

32
recipes-qt/qt6/qtdeclarative/0001-Update-QStringConverter-usage.patch
View File

@ -1,32 +0,0 @@
From 37abc70d02e28c761a3aa66ba57653d2db6082e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Tue, 6 Oct 2020 16:16:13 +0200
Subject: [PATCH] Update QStringConverter usage
Following fa8d021fa6fcb040fb702b6ffd2deee52a3b748a
Change-Id: I89c0231655ec853cef9465e5a88a92d7e0085d30
---
src/qml/qml/qqmlxmlhttprequest.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index bc2007b01a..a1f9377d79 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -1546,13 +1546,13 @@ QStringDecoder QQmlXMLHttpRequest::findTextDecoder() const
}
if (!decoder.isValid() && m_mime == "text/html") {
- auto encoding = QStringConverter::encodingForHtml(m_responseEntityBody.constData(), m_responseEntityBody.size());
+ auto encoding = QStringConverter::encodingForHtml(m_responseEntityBody);
if (encoding)
decoder = QStringDecoder(*encoding);
}
if (!decoder.isValid()) {
- auto encoding = QStringConverter::encodingForData(m_responseEntityBody.constData(), m_responseEntityBody.size());
+ auto encoding = QStringConverter::encodingForData(m_responseEntityBody);
if (encoding)
decoder = QStringDecoder(*encoding);
}

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

@ -12,12 +12,8 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Update-QStringConverter-usage.patch \
"
DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d17b2ae269b0cee63c3b34e493a108a188d27087"
SRCREV = "aba1bf6fca24ec6ee21ffc4417ef05d5d2cfdfeb"

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

@ -25,5 +25,5 @@ _FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "6da44e55fa0b92e41544c391ebcd8e828d013ee6"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_qtquick3d = "2aeace61fb1293412cb6983705792d21783c90a1"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

23
recipes-qt/qt6/qtquickcontrols2/0001-Update-QStringConverter-usage.patch
View File

@ -1,23 +0,0 @@
From 80c70e5f7fe1c9976ed07c0e852ffd789b68526f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 9 Oct 2020 10:30:49 +0300
Subject: [PATCH] Update QStringConverter usage
Change-Id: I45a1e38536fbd2549d1a22bc73fd170c4aa55c73
---
examples/quickcontrols2/texteditor/documenthandler.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp
index 72608910..e82fbb8c 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.cpp
+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp
@@ -304,7 +304,7 @@ void DocumentHandler::load(const QUrl &fileUrl)
if (mime.inherits("text/markdown")) {
emit loaded(QString::fromUtf8(data), Qt::MarkdownText);
} else {
- auto encoding = QStringConverter::encodingForHtml(data.constData(), data.size());
+ auto encoding = QStringConverter::encodingForHtml(data);
if (encoding) {
QStringDecoder decoder(*encoding);
emit loaded(decoder(data), Qt::AutoText);

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

@ -10,10 +10,6 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Update-QStringConverter-usage.patch \
"
DEPENDS = "qtbase qtdeclarative"
SRCREV = "e1d2073ddbd81e926640babe94e6d64076ce8eaa"
SRCREV = "819f290e17080f51f2e780c9e4b4532d67094d81"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "b217773a19ecde264658abac8dabeba3271e75c2"
SRCREV = "7f96f8082cf9cf685dd3a6e573ce10ab3704e926"

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

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "2c9b7a094a407f661bc215d2e5a02754517159c4"
SRCREV = "817057f133e1070f859291097ce4c55ce56165c7"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "f065a5a2a146e285564791455bb2151418a859bf"
SRCREV = "098df5861e7172b4665aa4c531b59bf8a2d9fb66"

23
recipes-qt/qt6/qttools/0001-QPlatformInterface-was-renamed-to-QNativeInterface.patch
View File

@ -1,23 +0,0 @@
From 8b9992720833bdf03bafebe5c7cc6db9cffabc45 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 9 Oct 2020 14:29:55 +0300
Subject: [PATCH] QPlatformInterface was renamed to QNativeInterface
Change-Id: I3f9c755978221a8d157784ab0cae947e115a7166
---
src/qtdiag/qtdiag.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index ca600d0b..ac643ea1 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -856,7 +856,7 @@ QString qtDiag(unsigned flags)
#ifdef Q_OS_WIN
// On Windows, this will provide addition GPU info similar to the output of dxdiag.
- using QWindowsApplication = QPlatformInterface::Private::QWindowsApplication;
+ using QWindowsApplication = QNativeInterface::Private::QWindowsApplication;
if (auto nativeWindowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration())) {
const QVariant gpuInfoV = nativeWindowsApp->gpuList();
if (gpuInfoV.type() == QVariant::List) {

24
recipes-qt/qt6/qttools/0001-Remove-pixelDensity.patch
View File

@ -1,24 +0,0 @@
From f0fd5e08401839131b9217f16c96e2cea359e270 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 9 Oct 2020 07:30:59 +0300
Subject: [PATCH] Remove pixelDensity
Change-Id: Ib5a9f6056ed3e32b816adf9005910a12501bebee
---
src/qtdiag/qtdiag.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index 41555201..ca600d0b 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -790,8 +790,7 @@ QString qtDiag(unsigned flags)
str << ' ' << platformScreen->subpixelAntialiasingTypeHint() << "\n ";
if (QHighDpiScaling::isActive())
str << "High DPI scaling factor: " << QHighDpiScaling::factor(screen) << ' ';
- str << "DevicePixelRatio: " << screen->devicePixelRatio()
- << " Pixel density: " << platformScreen->pixelDensity();
+ str << "DevicePixelRatio: " << screen->devicePixelRatio();
str << "\n Primary orientation: " << screen->primaryOrientation()
<< " Orientation: " << screen->orientation()
<< " Native orientation: " << screen->nativeOrientation()

60
recipes-qt/qt6/qttools/0001-Update-QStringConverter-usage.patch
View File

@ -1,60 +0,0 @@
From 356d4ec93a9a70584b705c663c8eea381d973b4d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 8 Oct 2020 16:46:16 +0300
Subject: [PATCH] Update QStringConverter usage
Change-Id: I04a8e5bbd4caf2d1f5b263ddca8f06ebd63b300d
---
src/assistant/help/qhelpsearchindexwriter_default.cpp | 2 +-
src/assistant/qhelpgenerator/helpgenerator.cpp | 4 ++--
src/linguist/shared/qm.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/assistant/help/qhelpsearchindexwriter_default.cpp b/src/assistant/help/qhelpsearchindexwriter_default.cpp
index 2e70ffaa..a814598f 100644
--- a/src/assistant/help/qhelpsearchindexwriter_default.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_default.cpp
@@ -502,7 +502,7 @@ void QHelpSearchIndexWriter::run()
}
QTextStream s(data);
- auto encoding = QStringDecoder::encodingForHtml(data.constData(), data.size());
+ auto encoding = QStringDecoder::encodingForHtml(data);
if (encoding)
s.setEncoding(*encoding);
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index 6e1db70b..d251e5f4 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -484,7 +484,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
QByteArray data = fi.readAll();
if (fileName.endsWith(QLatin1String(".html"))
|| fileName.endsWith(QLatin1String(".htm"))) {
- auto encoding = QStringDecoder::encodingForHtml(data.constData(), data.size());
+ auto encoding = QStringDecoder::encodingForHtml(data);
if (!encoding)
encoding = QStringDecoder::Utf8;
title = QHelpGlobal::documentTitle(QStringDecoder(*encoding)(data));
@@ -809,7 +809,7 @@ bool HelpGeneratorPrivate::checkLinks(const QHelpProjectData &helpData)
}
const QRegularExpression linkPattern(QLatin1String("<(?:a href|img src)=\"?([^#\">]+)[#\">]"));
QByteArray data = htmlFile.readAll();
- auto encoding = QStringDecoder::encodingForHtml(data.constData(), data.size());
+ auto encoding = QStringDecoder::encodingForHtml(data);
if (!encoding)
encoding = QStringDecoder::Utf8;
const QString &content = QStringDecoder(*encoding)(data);
diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
index 6eb9c874..0863a302 100644
--- a/src/linguist/shared/qm.cpp
+++ b/src/linguist/shared/qm.cpp
@@ -452,7 +452,7 @@ static quint32 read32(const uchar *data)
static void fromBytes(const char *str, int len, QString *out, bool *utf8Fail)
{
QStringDecoder toUnicode(QStringDecoder::Utf8, QStringDecoder::Flag::Stateless);
- *out = toUnicode(str, len);
+ *out = toUnicode(QByteArrayView(str, len));
*utf8Fail = toUnicode.hasError();
}

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

@ -12,14 +12,8 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Update-QStringConverter-usage.patch \
file://0001-Remove-pixelDensity.patch \
file://0001-QPlatformInterface-was-renamed-to-QNativeInterface.patch \
"
DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "05ffeba75e90e226cd6ddf7d72cb9b9d0ad5f172"
SRCREV = "973a988b8120c4326a21b4b578d0248ebb7ddb23"

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

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "9801953d647bf8f4385a8818befe95e07b4881d3"
SRCREV = "3c8e064b82aac5c15c1482d240e585fd3ef586be"

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 = "98aea22d839000a377d0fc646133f76e08b44f6e"
SRCREV = "f7231aa4e00d25938d3700e7923b5dc058c43b38"