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 Qt 6.0.0-beta3

Task-number: QTBUG-86349
Change-Id: Ief4bde6a1abdf6ae89bd0a22fddc1d40ec48fe90
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Mikko Gronoff 2020-10-30 10:04:43 +02:00
parent 217d6e886f
commit 3efb2b2e31
23 changed files with 21 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
recipes-qt/qt6/qt3d/0001-Fix-compilation-with-latest-QMutexLocker-changed.patch
View File

@ -1,22 +0,0 @@
From 1c7c8ce10b76afa98f46e98523c0cb91211dba85 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Wed, 28 Oct 2020 12:21:27 +0200
Subject: [PATCH] Fix compilation with latest QMutexLocker changed
---
src/core/resources/qresourcemanager_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index 82e8ad17f..954f7b5e4 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -165,7 +165,7 @@ public :
}
private:
- QMutexLocker m_locker;
+ QMutexLocker<QMutex> m_locker;
};
private:

3
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-compilation-with-latest-QMutexLocker-changed.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 = "f852aa731e3fdc79a4045425bc424fbbd3a4e50a"
SRCREV_qt3d = "279c76641a0ab0f4573789c905a836980bbe7325"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

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

@ -17,4 +17,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
SRCREV = "a892088d556b99fbcf1ceb00753f72d18fb00a71"
SRCREV = "b7d43eead565e8dd2b36880965f34475af2947bd"

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

@ -142,4 +142,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "b6cd3bca280bd81e932ff51a3ec2b9fc70231646"
SRCREV = "8040d3dce12a7c0ccc71dd1e1f2f018fdbcbf4dc"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d22ea28589767189cb0e38fc68bf5d7f308d0417"
SRCREV = "ebd78a166266f3091da750934b4d14b50d96a32f"

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

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "54a6382d0d26ed0854eea673d5dbf9d971fbeb3b"
SRCREV = "8385594baffa693b5187e04c01e66df0e5496ba8"

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

@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "9d2f8c3f0825f8114a2a916dd8e305f9848d2653"
SRCREV = "024527e1fa36fbe5f25e0e438d43d11cd15d68de"

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

@ -13,4 +13,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DBUILD_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
SRCREV = "7b0aa786ab0c55d484ffcd39237a58484bf4b17a"
SRCREV = "00ca74ada45599639bcf5e0793bd5a3982cb2443"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "96a4792139134e76d3d91305934295996bbb9cd4"
SRCREV = "bc11ea9a013e73f01cb715d5fdee07767f908c4f"

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

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

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

@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "8841bcc50dfd2d50accc9e793bbdb6e3d23ea508"
SRCREV_qtquick3d = "0eaccf72aa11caf5ee2ff0369ed83db69594549c"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

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

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "7f72d97132f33ea5fd8f81945fecde9c8a268186"
SRCREV = "6df8214d39106b1a3b6133357c764b909841d141"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "66471edfa249d77ff47dd1e38cad9a0ec1850531"
SRCREV = "d4b5804ccdb2d18970e4dbe6247f872d95ad9d64"

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

@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "9bea986b870e54bd04ccd23f2d204fbae16994b4"
SRCREV = "2be497ec245bb0c3780b7680998e12d010f66f36"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "cfc375388d6f38374984b1cf46e61606c8360335"
SRCREV = "5433343796549dc3393b341a2f65b398f8f4134d"

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

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "013571627787b7c8b57644f3e41f83d142d03bab"
SRCREV = "2cce6859c5c127d2d59c2187431238166051b002"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "5f45ccdf8bc09786766e8bd2f4b8c73dd7401812"
SRCREV = "1fcc86f538200ceca7412ab292947cdb2991d12c"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "0867b74d0381c9b5b0cbff6cc5d24a4d6b9e8ad9"
SRCREV = "2b3ad117e6cb7ea5d61c1d47f31dc61dd488f2bf"

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

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "d0097f07a3b247f1825b52aead61f0f5d51e4ff7"
SRCREV = "1070e2f4e242aef8ca7f70d67ad1e89e37c1be75"

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

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

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 = "77b494d39a72e588dde9711d7ab2f7b43b1dc630"
SRCREV = "7a49bd884f087fe86237e81e0358a60a9799c240"

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

@ -1,33 +0,0 @@
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.");

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

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