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: I52b6e3990b4f7d493316b51b6d4d7722d9be7280
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2020-10-09 11:32:28 +03:00
parent 858c5c397d
commit 10bd7c69eb
22 changed files with 230 additions and 20 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 = "3166eed9ec9883cb0df5ecc4fbeae68760bb5a58"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_qt3d = "48f3f9cc59e5fa6e410cb5424429cac2b37e09da"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"

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

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

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

@ -17,9 +17,6 @@ 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 \
file://0001-CMake-enable-egl_viv-plugins.patch \
file://0001-CMake-set-default-eglfs-device-integration-plugin.patch \
"
DEPENDS += "\
@ -139,4 +136,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "8059632fbdd656a4892918745244fd84a746ee93"
SRCREV = "56af9fb917b811a4e98c92364c6953f7f58adc45"

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

@ -0,0 +1,32 @@
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,8 +12,12 @@ 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 = "3ff1cbd6c071b53ed69bb310434070965246144a"
SRCREV = "d17b2ae269b0cee63c3b34e493a108a188d27087"

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

@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "7b41d70512359aa905d7ffec6301fda944d63a86"
SRCREV = "7cb70c79902b0a507815bd1b71f840aa73920063"

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

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

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

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

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

@ -0,0 +1,23 @@
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,6 +10,10 @@ 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 = "cd669f1f216e54fa59eee77459d608a41f5df290"
SRCREV = "e1d2073ddbd81e926640babe94e6d64076ce8eaa"

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

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

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

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

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

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

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

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

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

@ -0,0 +1,23 @@
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 Normal file
View File

@ -0,0 +1,24 @@
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 Normal file
View File

@ -0,0 +1,60 @@
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,8 +12,14 @@ 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 = "c4e1721c2431b5fb3500e77c3f0e1cd2c0fcd1b7"
SRCREV = "05ffeba75e90e226cd6ddf7d72cb9b9d0ad5f172"

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

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

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

33
recipes-qt/qt6/qtwebsockets/0001-Update-QStringConverter-usage.patch Normal file
View File

@ -0,0 +1,33 @@
From d2d892396346ee622d26196c5ab29a8df942654d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 12 Oct 2020 08:26:19 +0300
Subject: [PATCH] Update QStringConverter usage
Change-Id: Ic30656ad1cd9c9d49377b43da1ac77c661863f52
---
src/websockets/qwebsocketdataprocessor.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp
index 3ffc084..c881056 100644
--- a/src/websockets/qwebsocketdataprocessor.cpp
+++ b/src/websockets/qwebsocketdataprocessor.cpp
@@ -199,8 +199,7 @@ bool QWebSocketDataProcessor::process(QIODevice *pIoDevice)
}
if (m_opCode == QWebSocketProtocol::OpCodeText) {
- QString frameTxt = m_decoder(frame.payload().constData(),
- frame.payload().size());
+ QString frameTxt = m_decoder(frame.payload());
if (Q_UNLIKELY(m_decoder.hasError())) {
clear();
Q_EMIT errorEncountered(QWebSocketProtocol::CloseCodeWrongDatatype,
@@ -290,7 +289,7 @@ bool QWebSocketDataProcessor::processControlFrame(const QWebSocketFrame &frame)
if (payload.size() > 2) {
auto toUtf16 = QStringDecoder(QStringDecoder::Utf8,
QStringDecoder::Flag::Stateless | QStringDecoder::Flag::ConvertInvalidToNull);
- closeReason = toUtf16(payload.constData() + 2, payload.size() - 2);
+ closeReason = toUtf16(payload.right(payload.size() - 2));
if (Q_UNLIKELY(toUtf16.hasError())) {
closeCode = QWebSocketProtocol::CloseCodeWrongDatatype;
closeReason = tr("Invalid UTF-8 code encountered.");

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

@ -11,6 +11,10 @@ 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 = "2aad8a7928f2227bfce979b524c6c45d074cab18"