mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-04 16:10:12 +00:00
Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I663bd2937e769716f57e0a0252c76741f44181a7 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Daniel Smith
Samuli Piippo
parent
626697c8bd
commit
6b3073a959
|
|
@ -15,40 +15,40 @@ PV = "6.3.0"
|
|||
|
||||
SRCREV = "${SRCREV_${QT_MODULE}}"
|
||||
|
||||
SRCREV_qt3d = "8791c229971799c1a44d33f52b49927bea110831"
|
||||
SRCREV_qt3d = "51019bd7a6b7e0a22925bcb49d59afb5d7d82192"
|
||||
SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
|
||||
SRCREV_qt5compat = "7b441517eae58a937de1644bc2165d37d8da4d22"
|
||||
SRCREV_qtbase = "3c625b77529f1e5348e568b25852a6e5f1f159b0"
|
||||
SRCREV_qtcharts = "4e7f821e8954f025cde47fbc866acc28493d764d"
|
||||
SRCREV_qtcoap = "f5618569c8a4d50ec3439efcb420b562a8b1c5f1"
|
||||
SRCREV_qtconnectivity = "6b6280885aea1b7ceb665fc2fad995ed25045d33"
|
||||
SRCREV_qtdatavis3d = "61b154fd57b5dff60077d9e9cca38586b7874107"
|
||||
SRCREV_qtdeclarative = "c8335abf42174463f9def15393a42c35ffb5fe39"
|
||||
SRCREV_qtdeviceutilities = "baf90c5dd2599cc1928bbf18eb878564655c975b"
|
||||
SRCREV_qtimageformats = "ca47d4206c9a40c6c8143656c03fd2e749643469"
|
||||
SRCREV_qtlottie = "0bcbb7fb293a1c989774493957e568868dbc6747"
|
||||
SRCREV_qtmqtt = "dfeef617535172d05cbf1cbfc933d0de0c4c12a5"
|
||||
SRCREV_qtmultimedia = "6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7"
|
||||
SRCREV_qtnetworkauth = "7c3ec52f70d3244c42a067e7f77b3652b6d3fe03"
|
||||
SRCREV_qtopcua = "6accaffc378ec9773aac862ebc59a6b57a8c8609"
|
||||
SRCREV_qtlocation = "6f4ebbe2963a24659d24317e3ae936c4f5ffd15e"
|
||||
SRCREV_qtquick3d = "b76d7b1e622b143c427681020c49e12aa1a04c05"
|
||||
SRCREV_qt5compat = "4b7e14c18e5705a2709376c8c2813d639e093520"
|
||||
SRCREV_qtbase = "8dd14a956c7a2aa9b36a877c97a984675f0e43e4"
|
||||
SRCREV_qtcharts = "7468471137a12e0c00406003096379b7b4c9a186"
|
||||
SRCREV_qtcoap = "a46007716eecbcbe524c5f08bff6765d73d0ddd2"
|
||||
SRCREV_qtconnectivity = "bb25b75c40dcacefa7a2042b19d95ae4bcc5e191"
|
||||
SRCREV_qtdatavis3d = "2b1608c3204658fd1e9030d0e06a7cae841bc617"
|
||||
SRCREV_qtdeclarative = "5ed7c78c6b996a6caadd567c17d100d1a1c762f6"
|
||||
SRCREV_qtdeviceutilities = "c5c11ab8550144a36091e74111c1f01f38aaf017"
|
||||
SRCREV_qtimageformats = "ac5659e787b2aa6473256cc21a17cdc3fa6df275"
|
||||
SRCREV_qtlottie = "0a237e138deefda8286ef2ebe27383692fc774f5"
|
||||
SRCREV_qtmqtt = "a7c34dc49d9b856cb775a68b628344793d3b300f"
|
||||
SRCREV_qtmultimedia = "1b1c56debebe040ca22c2b244261246b76af69e4"
|
||||
SRCREV_qtnetworkauth = "5372b4faaedb32f77b00d05842993a2a6b9388c2"
|
||||
SRCREV_qtopcua = "6de1fd377680f12439b68833efd651cab4e197ef"
|
||||
SRCREV_qtlocation = "46f52104d8eb401c7f4ced10cdaf182a88e5f381"
|
||||
SRCREV_qtquick3d = "55ca309e6efb9adc083abf05bd4dff0e2649ff10"
|
||||
SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
|
||||
SRCREV_qtquickdesigner-components = "decdf79401763670419c45cd33e38390d46d8db4"
|
||||
SRCREV_qtquicktimeline = "bf82f2e445edf7a4c95f60919ad53a8ff306812f"
|
||||
SRCREV_qtremoteobjects = "6767c7915493498bcd15ba196050fb07169d4100"
|
||||
SRCREV_qtscxml = "0f685c628a4eaebd4274f4dee97d3f7b209f3027"
|
||||
SRCREV_qtsensors = "17be066692971ff51e3224d48809cf0946bc581c"
|
||||
SRCREV_qtserialbus = "09994f480917f9c5aa6b21a6999d53e402c406dd"
|
||||
SRCREV_qtserialport = "2d3d5112667105b4748418653ff737577e11267c"
|
||||
SRCREV_qtshadertools = "471099de67b868e9cdc418178ae9c542211fefe5"
|
||||
SRCREV_qtspeech = "462c3384467cec55a31fde11afb959321063a0ce"
|
||||
SRCREV_qtsvg = "09abc1ad49e55e7b3fb8cd3587075428a0bffa06"
|
||||
SRCREV_qttools = "14e0af4e3ca03f13f8ae2f9c62e6dd62d277ea4b"
|
||||
SRCREV_qtquicktimeline = "ca971975fec4ea474fef535bea35cd12d35a24d4"
|
||||
SRCREV_qtremoteobjects = "03b62026d24a3052fd023e99ceea3f646821a4a9"
|
||||
SRCREV_qtscxml = "dd0736d681d7a115d539cda7a6aea327b3c9b465"
|
||||
SRCREV_qtsensors = "83f869253a592d019d4875fc2729d4b65807c288"
|
||||
SRCREV_qtserialbus = "20518ae999155a0dac5758d3d853d11629da5ca1"
|
||||
SRCREV_qtserialport = "1052978d078a7b5ff45a21cdfcbd85933e372ac2"
|
||||
SRCREV_qtshadertools = "39db26d52e9a81fba7ad133d6697467c219857e4"
|
||||
SRCREV_qtspeech = "e823c481693e4bfac733b44737ef02be8360b713"
|
||||
SRCREV_qtsvg = "cdea1722b887986e7ec927e0ee1268ac010e32ee"
|
||||
SRCREV_qttools = "ae4f8b43654c9a1e9fd61d407744fa9ac10567c3"
|
||||
SRCREV_qttools-qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4"
|
||||
SRCREV_qttools-qlitehtml-litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83"
|
||||
SRCREV_qttranslations = "dbcf76dc2f7173906eee6c6f83630a90ab80b4a4"
|
||||
SRCREV_qtvirtualkeyboard = "04be79feea84aa668a9f72ae41beafca7e9fd0a4"
|
||||
SRCREV_qtwayland = "cfd65d318546162c1f8fad48b43da8ab62d24369"
|
||||
SRCREV_qtwebchannel = "e24d35a88d8f86cd0af450de801f9b9654db950a"
|
||||
SRCREV_qtwebsockets = "f4a6e71c448a8d058658c3e9e52adee5d0b947bf"
|
||||
SRCREV_qttranslations = "87a41fca5c59d7d865f49c27c28818a911d49849"
|
||||
SRCREV_qtvirtualkeyboard = "6391d320036b236a1bd2de07092749ceedb2d3e9"
|
||||
SRCREV_qtwayland = "545391a69516a0a25088625303ae1bfb9a72cee9"
|
||||
SRCREV_qtwebchannel = "47225ef650c8ad9565fffc4be04f750f3282bc37"
|
||||
SRCREV_qtwebsockets = "8ff30fd4ed8e599ee9794db4b2d8f1adb16b861c"
|
||||
|
|
|
|||
|
|
@ -1,110 +0,0 @@
|
|||
From 2ffd1ffb0e0ee6028849a279d36fe3f68fed1e99 Mon Sep 17 00:00:00 2001
|
||||
From: Mitch Curtis <mitch.curtis@qt.io>
|
||||
Date: Fri, 13 Aug 2021 11:07:57 +0200
|
||||
Subject: [PATCH] Fix build without accessibility
|
||||
|
||||
Amends 4b1acb290dc8869d0d2d1250dc1ed415d6b6e202 and friends.
|
||||
|
||||
Pick-to: 6.2
|
||||
Change-Id: Ida44dd5e1865673878601da97685fd1aa19c40c3
|
||||
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
||||
---
|
||||
src/quicknativestyle/qstyle/qquickstylehelper.cpp | 3 ++-
|
||||
src/quicknativestyle/qstyle/qquickstylehelper_p.h | 4 ++++
|
||||
src/quicktemplates2/CMakeLists.txt | 6 +++++-
|
||||
src/quicktemplates2/qtquicktemplates2global.cpp | 7 +++++++
|
||||
4 files changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/quicknativestyle/qstyle/qquickstylehelper.cpp b/src/quicknativestyle/qstyle/qquickstylehelper.cpp
|
||||
index ebc82864f9..fdc60b6468 100644
|
||||
--- a/src/quicknativestyle/qstyle/qquickstylehelper.cpp
|
||||
+++ b/src/quicknativestyle/qstyle/qquickstylehelper.cpp
|
||||
@@ -114,6 +114,7 @@ qreal dpiScaled(qreal value, const QStyleOption *option)
|
||||
return dpiScaled(value, dpi(option));
|
||||
}
|
||||
|
||||
+#if QT_CONFIG(accessibility)
|
||||
bool isInstanceOf(QObject *obj, QAccessible::Role role)
|
||||
{
|
||||
bool match = false;
|
||||
@@ -134,7 +135,7 @@ bool hasAncestor(QObject *obj, QAccessible::Role role)
|
||||
}
|
||||
return found;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
|
||||
int calcBigLineSize(int radius)
|
||||
{
|
||||
diff --git a/src/quicknativestyle/qstyle/qquickstylehelper_p.h b/src/quicknativestyle/qstyle/qquickstylehelper_p.h
|
||||
index 757d647d36..d2a9636be9 100644
|
||||
--- a/src/quicknativestyle/qstyle/qquickstylehelper_p.h
|
||||
+++ b/src/quicknativestyle/qstyle/qquickstylehelper_p.h
|
||||
@@ -39,7 +39,9 @@
|
||||
#include <QtGui/qpaintdevice.h>
|
||||
#include <QtGui/qpolygon.h>
|
||||
#include <QtCore/qstringbuilder.h>
|
||||
+#if QT_CONFIG(accessibility)
|
||||
#include <QtGui/qaccessible.h>
|
||||
+#endif
|
||||
|
||||
#ifndef QSTYLEHELPER_P_H
|
||||
#define QSTYLEHELPER_P_H
|
||||
@@ -84,8 +86,10 @@ namespace QStyleHelper
|
||||
int left = 0, int top = 0, int right = 0,
|
||||
int bottom = 0);
|
||||
|
||||
+#if QT_CONFIG(accessibility)
|
||||
bool isInstanceOf(QObject *obj, QAccessible::Role role);
|
||||
bool hasAncestor(QObject *obj, QAccessible::Role role);
|
||||
+#endif
|
||||
QColor backgroundColor(const QPalette &pal);
|
||||
|
||||
enum WidgetSizePolicy { SizeLarge = 0, SizeSmall = 1, SizeMini = 2, SizeDefault = -1 };
|
||||
diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt
|
||||
index 80b05013ad..3ddb994cc1 100644
|
||||
--- a/src/quicktemplates2/CMakeLists.txt
|
||||
+++ b/src/quicktemplates2/CMakeLists.txt
|
||||
@@ -12,7 +12,6 @@ qt_internal_add_qml_module(QuickTemplates2
|
||||
NO_PLUGIN_OPTIONAL
|
||||
NO_GENERATE_PLUGIN_SOURCE
|
||||
SOURCES
|
||||
- accessible/qaccessiblequickpage.cpp accessible/qaccessiblequickpage_p.h
|
||||
qquickabstractbutton.cpp qquickabstractbutton_p.h
|
||||
qquickabstractbutton_p_p.h
|
||||
qquickaction.cpp qquickaction_p.h
|
||||
@@ -144,6 +143,11 @@ qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels
|
||||
Qt::QmlModelsPrivate
|
||||
)
|
||||
|
||||
+qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_accessibility
|
||||
+ SOURCES
|
||||
+ accessible/qaccessiblequickpage.cpp accessible/qaccessiblequickpage_p.h
|
||||
+)
|
||||
+
|
||||
qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_tableview
|
||||
SOURCES
|
||||
qquickheaderview.cpp qquickheaderview_p.h
|
||||
diff --git a/src/quicktemplates2/qtquicktemplates2global.cpp b/src/quicktemplates2/qtquicktemplates2global.cpp
|
||||
index 5d7816b411..5100e610bc 100644
|
||||
--- a/src/quicktemplates2/qtquicktemplates2global.cpp
|
||||
+++ b/src/quicktemplates2/qtquicktemplates2global.cpp
|
||||
@@ -36,8 +36,15 @@
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
+
|
||||
+#include "qtquicktemplates2global_p.h"
|
||||
+
|
||||
+#include <QtGui/qtguiglobal.h>
|
||||
+
|
||||
+#if QT_CONFIG(accessibility)
|
||||
#include "qquickpage_p.h"
|
||||
#include "accessible/qaccessiblequickpage_p.h"
|
||||
+#endif
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -12,8 +12,6 @@ inherit qt6-cmake
|
|||
include recipes-qt/qt6/qt6-git.inc
|
||||
include recipes-qt/qt6/qt6.inc
|
||||
|
||||
SRC_URI += "file://0001-Fix-build-without-accessibility.patch"
|
||||
|
||||
DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user