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 
Change-Id: I891ef5357339a023c68f372f4b98bc9ec7243d05
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Mikko Gronoff 2020-09-23 09:51:13 +03:00
parent e400d8ff3c
commit ff154cda1e
23 changed files with 93 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
recipes-qt/qt6/qt3d/0001-Fix-build-with-latest-QtBase.patch
View File

@ -1,38 +0,0 @@
From 5463fecde6833b0642e653ae1dd3037a8c7d93e5 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Thu, 3 Sep 2020 11:01:47 +0100
Subject: [PATCH] Fix build with latest QtBase
Task-number: QTBUG-86410
Change-Id: I26427d65de72c86f952b076259979f90eaef87f4
---
src/animation/backend/functionrangefinder_p.h | 2 +-
src/plugins/renderers/rhi/io/rhibuffer.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/animation/backend/functionrangefinder_p.h b/src/animation/backend/functionrangefinder_p.h
index 5df05bea4..004bea4b8 100644
--- a/src/animation/backend/functionrangefinder_p.h
+++ b/src/animation/backend/functionrangefinder_p.h
@@ -81,7 +81,7 @@ private:
int locate(float x) const;
int hunt(float x) const;
- const QList<float> &m_x;
+ QList<float> m_x;
mutable int m_previousLowerBound;
mutable bool m_correlated;
int m_rangeSize;
diff --git a/src/plugins/renderers/rhi/io/rhibuffer.cpp b/src/plugins/renderers/rhi/io/rhibuffer.cpp
index 33818e69e..c2744dd6c 100644
--- a/src/plugins/renderers/rhi/io/rhibuffer.cpp
+++ b/src/plugins/renderers/rhi/io/rhibuffer.cpp
@@ -165,7 +165,7 @@ void RHIBuffer::allocate(const QByteArray &data, bool dynamic)
m_datasToUpload.clear();
m_datasToUpload.push_back({ data, 0 });
- m_allocSize = std::max(m_allocSize, data.size());
+ m_allocSize = qMax(m_allocSize, data.size());
m_dynamic = dynamic;
}

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

@ -15,7 +15,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-Fix-build-with-latest-QtBase.patch \
"
DEPENDS = "qtbase qtdeclarative qtshadertools-native"
@ -26,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "befd2091a6a2f667eddabd35b8c6d7c0783b72ec"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_qt3d = "88ac9513465d900f135da8cec94db2634ee63a3d"
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 = "fbab81cbb39e2910b131ba890e49dd0140f54adb"
SRCREV = "f0af3eb5591c26b40454362c492a155282a8536f"

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

@ -0,0 +1,29 @@
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

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

@ -17,6 +17,7 @@ SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0005-Allow-build-without-opengl.patch \
file://0001-CMake-use-HostInfo-when-QT_HOST_PATH-is-set.patch \
"
DEPENDS += "\
@ -136,4 +137,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "0e0149c64dc9b4cf46f4e8f01e5680e7ea5372c4"
SRCREV = "8059632fbdd656a4892918745244fd84a746ee93"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "3f3c140d639813e15c95309a1356577f489ea4ff"
SRCREV = "3ff1cbd6c071b53ed69bb310434070965246144a"

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

@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "adbe3de48634ec054174f63858a80cb6e50d2120"
SRCREV = "3a7181de414b4952ac93e9f148a98f7e69773718"

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

@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "ad56c5073dc5c15e8100a346c66551201187265d"
SRCREV = "c1801de214ae82798ea420d687227a78fa81b8b8"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "dde7642ff50e146787afbd852e321b35089f6f17"
SRCREV = "fa14a2f743269c3d35820bb855f8d6bd616bd8e8"

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

@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "e851fb766021277d64b013a1594c5471f4fba55a"
SRCREV = "6bad87fc30b323703d2f83e04cadbb386e029224"

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

@ -25,5 +25,5 @@ _FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "0c23c8609285af5bd07aec647cba365a4d8c8027"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_qtquick3d = "b31e7a6dcd4c86605400e3697dffd52a64253c72"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

203
recipes-qt/qt6/qtquickcontrols2/0001-Adapt-to-rename-of-QFont-QPalette-resolve-to-resolve.patch
View File

@ -1,203 +0,0 @@
From 52ee886359ff732e76fca0427e0ba007cbbb9e2c Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Tue, 25 Aug 2020 12:42:25 +0200
Subject: [PATCH] Adapt to rename of QFont/QPalette::resolve to resolveMask
Change-Id: I2876812653ddd451bb7c2f21d536b5e0196f0a94
---
src/quicktemplates2/qquickapplicationwindow.cpp | 4 ++--
src/quicktemplates2/qquickcontrol.cpp | 4 ++--
src/quicktemplates2/qquickcontrol_p_p.h | 2 +-
src/quicktemplates2/qquicklabel.cpp | 4 ++--
src/quicktemplates2/qquicklabel_p_p.h | 2 +-
src/quicktemplates2/qquicktextarea.cpp | 4 ++--
src/quicktemplates2/qquicktextarea_p_p.h | 2 +-
src/quicktemplates2/qquicktextfield.cpp | 4 ++--
src/quicktemplates2/qquicktextfield_p_p.h | 2 +-
src/quicktemplates2/qquicktheme.cpp | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 3d39a04ee..c825a0639 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -147,7 +147,7 @@ public:
void updateFont(const QFont &f);
inline void setFont_helper(const QFont &f) {
- if (font.resolve() == f.resolve() && font == f)
+ if (font.resolveMask() == f.resolveMask() && font == f)
return;
updateFont(f);
}
@@ -611,7 +611,7 @@ QFont QQuickApplicationWindow::font() const
void QQuickApplicationWindow::setFont(const QFont &font)
{
Q_D(QQuickApplicationWindow);
- if (d->font.resolve() == font.resolve() && d->font == font)
+ if (d->font.resolveMask() == font.resolveMask() && d->font == font)
return;
QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System));
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 22b7f922f..86b2600d8 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -562,7 +562,7 @@ void QQuickControlPrivate::inheritFont(const QFont &font)
{
Q_Q(QQuickControl);
QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
- parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
+ parentFont.setResolveMask(extra.isAllocated() ? extra->requestedFont.resolveMask() | font.resolveMask() : font.resolveMask());
const QFont defaultFont = q->defaultFont();
QFont resolvedFont = parentFont.resolve(defaultFont);
@@ -973,7 +973,7 @@ QFont QQuickControl::font() const
void QQuickControl::setFont(const QFont &font)
{
Q_D(QQuickControl);
- if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font)
+ if (d->extra.value().requestedFont.resolveMask() == font.resolveMask() && d->extra.value().requestedFont == font)
return;
d->extra.value().requestedFont = font;
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 116e8745c..15d0ef743 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -139,7 +139,7 @@ public:
void updateFont(const QFont &font);
static void updateFontRecur(QQuickItem *item, const QFont &font);
inline void setFont_helper(const QFont &font) {
- if (resolvedFont.resolve() == font.resolve() && resolvedFont == font)
+ if (resolvedFont.resolveMask() == font.resolveMask() && resolvedFont == font)
return;
updateFont(font);
}
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 144d2fe7d..183b0f803 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -180,7 +180,7 @@ void QQuickLabelPrivate::resolveFont()
void QQuickLabelPrivate::inheritFont(const QFont &font)
{
QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
- parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
+ parentFont.setResolveMask(extra.isAllocated() ? extra->requestedFont.resolveMask() | font.resolveMask() : font.resolveMask());
const QFont defaultFont = QQuickTheme::font(QQuickTheme::Label);
QFont resolvedFont = parentFont.resolve(defaultFont);
@@ -329,7 +329,7 @@ QFont QQuickLabel::font() const
void QQuickLabel::setFont(const QFont &font)
{
Q_D(QQuickLabel);
- if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font)
+ if (d->extra.value().requestedFont.resolveMask() == font.resolveMask() && d->extra.value().requestedFont == font)
return;
d->extra.value().requestedFont = font;
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index deed89f53..a9bda6717 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
@@ -93,7 +93,7 @@ public:
void inheritFont(const QFont &font);
void updateFont(const QFont &font);
inline void setFont_helper(const QFont &font) {
- if (sourceFont.resolve() == font.resolve() && sourceFont == font)
+ if (sourceFont.resolveMask() == font.resolveMask() && sourceFont == font)
return;
updateFont(font);
}
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 3495cb024..a740447f7 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -260,7 +260,7 @@ void QQuickTextAreaPrivate::resolveFont()
void QQuickTextAreaPrivate::inheritFont(const QFont &font)
{
QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
- parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
+ parentFont.setResolveMask(extra.isAllocated() ? extra->requestedFont.resolveMask() | font.resolveMask() : font.resolveMask());
const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextArea);
QFont resolvedFont = parentFont.resolve(defaultFont);
@@ -569,7 +569,7 @@ QFont QQuickTextArea::font() const
void QQuickTextArea::setFont(const QFont &font)
{
Q_D(QQuickTextArea);
- if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font)
+ if (d->extra.value().requestedFont.resolveMask() == font.resolveMask() && d->extra.value().requestedFont == font)
return;
d->extra.value().requestedFont = font;
diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h
index 02c77b07f..2ed2b44f3 100644
--- a/src/quicktemplates2/qquicktextarea_p_p.h
+++ b/src/quicktemplates2/qquicktextarea_p_p.h
@@ -98,7 +98,7 @@ public:
void inheritFont(const QFont &font);
void updateFont(const QFont &font);
inline void setFont_helper(const QFont &font) {
- if (sourceFont.resolve() == font.resolve() && sourceFont == font)
+ if (sourceFont.resolveMask() == font.resolveMask() && sourceFont == font)
return;
updateFont(font);
}
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index c8e610948..47026e1be 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -222,7 +222,7 @@ void QQuickTextFieldPrivate::resolveFont()
void QQuickTextFieldPrivate::inheritFont(const QFont &font)
{
QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font;
- parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
+ parentFont.setResolveMask(extra.isAllocated() ? extra->requestedFont.resolveMask() | font.resolveMask() : font.resolveMask());
const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextField);
QFont resolvedFont = parentFont.resolve(defaultFont);
@@ -429,7 +429,7 @@ QFont QQuickTextField::font() const
void QQuickTextField::setFont(const QFont &font)
{
Q_D(QQuickTextField);
- if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font)
+ if (d->extra.value().requestedFont.resolveMask() == font.resolveMask() && d->extra.value().requestedFont == font)
return;
d->extra.value().requestedFont = font;
diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h
index a816614da..d81289726 100644
--- a/src/quicktemplates2/qquicktextfield_p_p.h
+++ b/src/quicktemplates2/qquicktextfield_p_p.h
@@ -94,7 +94,7 @@ public:
void inheritFont(const QFont &font);
void updateFont(const QFont &font);
inline void setFont_helper(const QFont &font) {
- if (sourceFont.resolve() == font.resolve() && sourceFont == font)
+ if (sourceFont.resolveMask() == font.resolveMask() && sourceFont == font)
return;
updateFont(font);
}
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp
index f8c4a251f..b80e87e60 100644
--- a/src/quicktemplates2/qquicktheme.cpp
+++ b/src/quicktemplates2/qquicktheme.cpp
@@ -131,7 +131,7 @@ QFont QQuickTheme::font(Scope scope)
if (font) {
QFont f = *font;
if (scope == System)
- f.resolve(0);
+ f.setResolveMask(0);
return f;
}
@@ -152,7 +152,7 @@ QPalette QQuickTheme::palette(Scope scope)
if (palette) {
QPalette f = *palette;
if (scope == System)
- f.resolve(0);
+ f.setResolveMask(0);
return f;
}

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-Adapt-to-rename-of-QFont-QPalette-resolve-to-resolve.patch \
"
DEPENDS = "qtbase qtdeclarative"
SRCREV = "52ae6b1a506bea501ac7db424edddfa18383d20a"
SRCREV = "fbc629892461662a20e12c38f182fddb1fcc3a81"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "faca1580d97332d585a95ff219fce45d779acf0a"
SRCREV = "56d474c4eabb80e8b8de5e18d144a5cb15485027"

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

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d0a9ff570105c64583d7314035a95e57a4c5b0da"
SRCREV = "23148650918e540064c080eccb3fcb2d8177089d"

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

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "2151f3715c4f082fa32841a034d7cf3a2ae10533"
SRCREV = "dd3639ae14b2956186e1131e7c772e2956434379"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "b5d4667d3da863512e4a3c9a1b88c944d268dd7d"
SRCREV = "e09b8bdd112dd70933b1dbceb702037b77cf4386"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "3e67b5e4df84421b77f90cbf242abb4a3c4c93a5"
SRCREV = "8a2b3132e99203b5f46a57b07efe7afc1089ca36"

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

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "67eeb6b8d66c340d4ecda09ee14f281d35581e5f"
SRCREV = "1655aacfbe31af01849d30db95ef4367b5e3f0a3"

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

@ -118,4 +118,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "c7c254c23f5b0162dd4854a8ce0b7b18be974b94"
SRCREV = "62f2f8236ca4b587f0021f4feb75ba25ebaf0b0a"

41
recipes-qt/qt6/qtwayland/0001-Fix-compilation-after-mime-data-API-changes.patch Normal file
View File

@ -0,0 +1,41 @@
From 5febdf595e514be41480a997cc606570e704fb6c Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Date: Mon, 28 Sep 2020 12:11:27 +0200
Subject: [PATCH] Fix compilation after mime data API changes
Follows 848927b688d4709d0b71590518e2c32fe7866147 in qtbase,
where the signature of retrieveData_sys() was changed.
Fixes: QTBUG-87003
Change-Id: I8b88c8f9547e599328f40345a9fbf57c07ec31a4
---
src/client/qwaylanddataoffer.cpp | 2 +-
src/client/qwaylanddataoffer_p.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp
index 2297e8a1..5d0a8d47 100644
--- a/src/client/qwaylanddataoffer.cpp
+++ b/src/client/qwaylanddataoffer.cpp
@@ -124,7 +124,7 @@ QStringList QWaylandMimeData::formats_sys() const
return m_types;
}
-QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QVariant::Type type) const
+QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QMetaType type) const
{
Q_UNUSED(type);
diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h
index 9cf1483c..50c05732 100644
--- a/src/client/qwaylanddataoffer_p.h
+++ b/src/client/qwaylanddataoffer_p.h
@@ -106,7 +106,7 @@ public:
protected:
bool hasFormat_sys(const QString &mimeType) const override;
QStringList formats_sys() const override;
- QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const override;
+ QVariant retrieveData_sys(const QString &mimeType, QMetaType type) const override;
private:
int readData(int fd, QByteArray &data) const;

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

@ -14,6 +14,7 @@ include recipes-qt/qt6/qt6.inc
SRC_URI +="\
file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
file://0001-Fix-compilation-after-mime-data-API-changes.patch \
"
PACKAGECONFIG ?= "\
@ -37,4 +38,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "07b2d3e68d5223cd41f0091fea6f2fa036c80ac4"
SRCREV = "7ae0ccc3fcd565da0d36ad07ffd67bce5d75df07"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "134fde4ab42a546bfe99d1fac002f87144d2c9e3"
SRCREV = "2aad8a7928f2227bfce979b524c6c45d074cab18"