qt6: update submodules

Latest revisions from dev.

Change-Id: Ia9b1bed92a4d6d5ffad5293bece76278e9d14a8c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2021-09-10 13:54:54 +03:00
parent 3c758b95f9
commit c592e2d63e
32 changed files with 145 additions and 33 deletions

View File

@ -26,5 +26,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "ea97722b666c4bce4e07bc7f69df7a9d5a6d35c3"
SRCREV_qt3d = "8791c229971799c1a44d33f52b49927bea110831"
SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"

View File

@ -21,4 +21,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative"
BBCLASSEXTEND = "native nativesdk"
SRCREV = "01e723f613379f92d0bdfb7ac4c2585529c58959"
SRCREV = "7b441517eae58a937de1644bc2165d37d8da4d22"

View File

@ -160,4 +160,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
BBCLASSEXTEND = "native nativesdk"
SRCREV = "7166a82844500238a4dad91857384479c7b35817"
SRCREV = "3c625b77529f1e5348e568b25852a6e5f1f159b0"

View File

@ -13,4 +13,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG ?= "qml"
PACKAGECONFIG[qml] = ",,qtdeclarative"
SRCREV = "31db4af85c1183e617f4796567e76e4e9eba263c"
SRCREV = "4e7f821e8954f025cde47fbc866acc28493d764d"

View File

@ -12,4 +12,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
SRCREV = "bb17d70b6b2026641b3f9046f38df5e4da35c62a"
SRCREV = "f5618569c8a4d50ec3439efcb420b562a8b1c5f1"

View File

@ -20,4 +20,4 @@ DEPENDS += "qtbase qtdeclarative"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
SRCREV = "902ef11ca6b72cc7f00e14960ced7749315ec2c1"
SRCREV = "6b6280885aea1b7ceb665fc2fad995ed25045d33"

View File

@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "cf94dd2a0a82910888d5a9d518b16fd541817eaf"
SRCREV = "61b154fd57b5dff60077d9e9cca38586b7874107"

View File

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

View File

@ -12,8 +12,10 @@ 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"
SRCREV = "14a3b34906be5b749ebc6b6c1d8f6807fff8fd88"
SRCREV = "c8335abf42174463f9def15393a42c35ffb5fe39"

View File

@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
SRCREV = "191b1827fd705ae6844aab79fe9b3fabf7e8866e"
SRCREV = "ca47d4206c9a40c6c8143656c03fd2e749643469"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "8742e3c0505890b862a34bd2b8edf29e4b83de09"
SRCREV = "0bcbb7fb293a1c989774493957e568868dbc6747"

View File

@ -13,4 +13,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
SRCREV = "97edfad888ba2c8fb25b29ae85c75118a1ed775b"
SRCREV = "dfeef617535172d05cbf1cbfc933d0de0c4c12a5"

View File

@ -22,4 +22,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative"
EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF"
SRCREV = "912fe1cc33b7c1e526db123b576dbb856db8ecd9"
SRCREV = "6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "9b94571abab2164c4c53a4ed45576c116eb77024"
SRCREV = "7c3ec52f70d3244c42a067e7f77b3652b6d3fe03"

View File

@ -20,4 +20,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "03b10c78eb5926859ff1a44bf8dca7b9ecfab6e5"
SRCREV = "6accaffc378ec9773aac862ebc59a6b57a8c8609"

View File

@ -23,4 +23,4 @@ PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
PACKAGECONFIG[nmea] = ",,qtserialport"
PACKAGECONFIG[qml] = ",,qtdeclarative"
SRCREV = "1936e026e1ea550f716d1bb3fbcd55c16802b3bb"
SRCREV = "6f4ebbe2963a24659d24317e3ae936c4f5ffd15e"

View File

@ -26,5 +26,5 @@ FILES:${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "5355de5520bb8455676ae84f37c22fda32aded36"
SRCREV_qtquick3d = "b76d7b1e622b143c427681020c49e12aa1a04c05"
SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"

View File

@ -13,4 +13,4 @@ QT_MODULE_BRANCH = "dev"
DEPENDS += "qtbase qtdeclarative"
SRCREV = "13617652eec2e7cae989c1707fd591e7685d7241"
SRCREV = "decdf79401763670419c45cd33e38390d46d8db4"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "f1ea62f26345978cdc0fd09aa3e90630f4feab2b"
SRCREV = "bf82f2e445edf7a4c95f60919ad53a8ff306812f"

View File

@ -13,6 +13,6 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
SRCREV = "97f093f419487a97d819c6a816f45c8b4b3f9440"
SRCREV = "6767c7915493498bcd15ba196050fb07169d4100"
BBCLASSEXTEND += "native nativesdk"

View File

@ -17,4 +17,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
BBCLASSEXTEND = "native nativesdk"
SRCREV = "9ec81171adae17e1e0cbd65178638180fe0e416e"
SRCREV = "0f685c628a4eaebd4274f4dee97d3f7b209f3027"

View File

@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "62012d57b6b4750790bfd2522142d3e5b93deb0e"
SRCREV = "17be066692971ff51e3224d48809cf0946bc581c"

View File

@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
BBCLASSEXTEND = "native nativesdk"
SRCREV = "1e07f731483a2b507270289550583ce41795e40c"
SRCREV = "09994f480917f9c5aa6b21a6999d53e402c406dd"

View File

@ -16,4 +16,4 @@ DEPENDS += "qtbase"
BBCLASSEXTEND = "native nativesdk"
SRCREV = "7307043f3e7fa1ec6ab8d7dd52a027ac42e72256"
SRCREV = "2d3d5112667105b4748418653ff737577e11267c"

View File

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND = "native nativesdk"
SRCREV = "312d60863c52a06341a3871d228fae9225b965fd"
SRCREV = "471099de67b868e9cdc418178ae9c542211fefe5"

View File

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "f890cc7b639faeacfd207966d4e484f421c0037b"
SRCREV = "09abc1ad49e55e7b3fb8cd3587075428a0bffa06"

View File

@ -25,6 +25,6 @@ BBCLASSEXTEND = "native nativesdk"
SRCREV_FORMAT = "qttools_qlitehtml_litehtml"
SRCREV_qttools = "9200e6863002edb45c4ebe195d9ba22b14c1117d"
SRCREV_qlitehtml = "2fbaad08a01d611858bef5e747addea7f42318b3"
SRCREV_litehtml = "2c033bff0ba2d93e5d58303523800d03c21903d4"
SRCREV_qttools = "14e0af4e3ca03f13f8ae2f9c62e6dd62d277ea4b"
SRCREV_qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4"
SRCREV_litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83"

View File

@ -25,4 +25,4 @@ python split_translation_packages () {
d.setVar('RRECOMMENDS:' + pn, ' '.join(pkgs))
}
SRCREV = "5314247721123221864ad6f4b98d326f67b0a942"
SRCREV = "dbcf76dc2f7173906eee6c6f83630a90ab80b4a4"

View File

@ -115,4 +115,4 @@ FILES:${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "d8630c116ba36277c89c5b80ba65690e5c1115ea"
SRCREV = "04be79feea84aa668a9f72ae41beafca7e9fd0a4"

View File

@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND = "native nativesdk"
SRCREV = "0381b8130da4b448b0aec7d9841e2e7897e65f85"
SRCREV = "cfd65d318546162c1f8fad48b43da8ab62d24369"

View File

@ -18,4 +18,4 @@ PACKAGECONFIG ?= "qml"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
PACKAGECONFIG[qml] = ",,qtdeclarative"
SRCREV = "a79d015bec5b5a55c5975f1fdcca8f3b7e0b0b28"
SRCREV = "e24d35a88d8f86cd0af450de801f9b9654db950a"

View File

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "24e348c617436b1afc1d9db7fdfa8b8f876e06b7"
SRCREV = "f4a6e71c448a8d058658c3e9e52adee5d0b947bf"