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

Update modules

Browse Source 
Change-Id: Ifdd2095ebf7d64ab530258e989a85671de058ab9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2020-09-07 12:08:00 +03:00
parent a37fb5e1a0
commit f02fda42eb
21 changed files with 265 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coin/test-configs.inc
View File

@ -30,7 +30,7 @@ PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
PACKAGECONFIG_append_pn-qtbase = "\
tslib kms gbm zstd lttng libproxy gssapi vulkan mtdev cups \
tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
sql-mysql sql-psql sql-sqlite journald \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
"

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

@ -0,0 +1,38 @@
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,6 +15,7 @@ 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"
@ -24,6 +25,6 @@ PACKAGECONFIG_class-target ?= "system-assimp"
PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_assimp=OFF,assimp"
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_qt3d = "f248b8a3bce2e7f0842f51ab7665f3efc3c9274e"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "befd2091a6a2f667eddabd35b8c6d7c0783b72ec"
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 = "d675a522d6ab75509abd49a917ab8b424c393834"
SRCREV = "fbab81cbb39e2910b131ba890e49dd0140f54adb"

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

@ -140,4 +140,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "eb7d1cf098df56f8ebf62f02af611a627435a4a1"
SRCREV = "0e0149c64dc9b4cf46f4e8f01e5680e7ea5372c4"

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

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

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

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

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

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

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

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

116
recipes-qt/qt6/qtquick3d/0001-CMake-regenerate-CMakeLists-for-tools.patch
View File

@ -1,116 +0,0 @@
From ec1191ae4bd16841c1db58ded60f0fdf7c804cbc Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 31 Aug 2020 09:55:21 +0300
Subject: [PATCH] CMake: regenerate CMakeLists for tools
Use qt_get_tool_target_name
Change-Id: I8b835a58cb0b95df978d87437d39df95aecc6ca5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
tools/balsam/.prev_CMakeLists.txt | 3 ++-
tools/balsam/CMakeLists.txt | 3 ++-
tools/meshdebug/.prev_CMakeLists.txt | 3 ++-
tools/meshdebug/CMakeLists.txt | 3 ++-
tools/shadergen/.prev_CMakeLists.txt | 21 +++++++++++++++++++++
tools/shadergen/CMakeLists.txt | 3 ++-
6 files changed, 31 insertions(+), 5 deletions(-)
create mode 100644 tools/shadergen/.prev_CMakeLists.txt
diff --git a/tools/balsam/.prev_CMakeLists.txt b/tools/balsam/.prev_CMakeLists.txt
index b42e580c..f2736e58 100644
--- a/tools/balsam/.prev_CMakeLists.txt
+++ b/tools/balsam/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## balsam Tool:
#####################################################################
-qt_add_tool(balsam
+qt_get_tool_target_name(target_name balsam)
+qt_add_tool(${target_name}
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tools/balsam/CMakeLists.txt b/tools/balsam/CMakeLists.txt
index 55a090de..c8cd1d2b 100644
--- a/tools/balsam/CMakeLists.txt
+++ b/tools/balsam/CMakeLists.txt
@@ -4,7 +4,8 @@
## balsam Tool:
#####################################################################
-qt_add_tool(balsam
+qt_get_tool_target_name(target_name balsam)
+qt_add_tool(${target_name}
TOOLS_TARGET Quick3D # special case
SOURCES
main.cpp
diff --git a/tools/meshdebug/.prev_CMakeLists.txt b/tools/meshdebug/.prev_CMakeLists.txt
index 9ca4153a..34815a57 100644
--- a/tools/meshdebug/.prev_CMakeLists.txt
+++ b/tools/meshdebug/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## meshdebug Tool:
#####################################################################
-qt_add_tool(meshdebug
+qt_get_tool_target_name(target_name meshdebug)
+qt_add_tool(${target_name}
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tools/meshdebug/CMakeLists.txt b/tools/meshdebug/CMakeLists.txt
index 18872bd7..a99ad773 100644
--- a/tools/meshdebug/CMakeLists.txt
+++ b/tools/meshdebug/CMakeLists.txt
@@ -4,7 +4,8 @@
## meshdebug Tool:
#####################################################################
-qt_add_tool(meshdebug
+qt_get_tool_target_name(target_name meshdebug)
+qt_add_tool(${target_name}
TOOLS_TARGET Quick3D # special case
SOURCES
main.cpp
diff --git a/tools/shadergen/.prev_CMakeLists.txt b/tools/shadergen/.prev_CMakeLists.txt
new file mode 100644
index 00000000..895ad73f
--- /dev/null
+++ b/tools/shadergen/.prev_CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from shadergen.pro.
+
+#####################################################################
+## shadergen Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name shadergen)
+qt_add_tool(${target_name}
+ SOURCES
+ genshaders.cpp genshaders.h
+ main.cpp
+ parser.cpp parser.h
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::GuiPrivate
+ Qt::Qml
+ Qt::QmlPrivate
+ Qt::Quick3DPrivate
+ Qt::Quick3DRuntimeRender
+ Qt::Quick3DRuntimeRenderPrivate
+)
diff --git a/tools/shadergen/CMakeLists.txt b/tools/shadergen/CMakeLists.txt
index f586767c..310473c7 100644
--- a/tools/shadergen/CMakeLists.txt
+++ b/tools/shadergen/CMakeLists.txt
@@ -4,7 +4,8 @@
## shadergen Tool:
#####################################################################
-qt_add_tool(shadergen
+qt_get_tool_target_name(target_name shadergen)
+qt_add_tool(${target_name}
TOOLS_TARGET Quick3D # special case
SOURCES
genshaders.cpp genshaders.h

187
recipes-qt/qt6/qtquick3d/0001-Enable-build-with-QT_NO_OPENGL.patch
View File

@ -1,187 +0,0 @@
From 6ec1aee97dd54d03212aede9449ad60448826d1e Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@qt.io>
Date: Mon, 31 Aug 2020 09:26:17 +0200
Subject: [PATCH] Enable build with QT_NO_OPENGL
Change-Id: I35ea1aaea8b941bb5d81a5081e54d6f249bec324
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
CMakeLists.txt | 4 ----
src/quick3d/qquick3d.cpp | 17 ++++++++++++-----
src/quick3d/qquick3dscenerenderer_p.h | 2 --
src/quick3d/qquick3dviewport.cpp | 3 +--
src/quick3d/qquick3dviewport_p.h | 1 -
src/runtimerender/qssgrendershadercache.cpp | 11 ++++++++---
.../qssgrendershadercodegenerator.cpp | 2 --
.../resourcemanager/qssgrenderloadedtexture.cpp | 1 -
8 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9392af7..8f527d7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,4 @@ if(NOT TARGET Qt::Quick)
message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.")
return()
endif()
-if(NOT QT_FEATURE_opengl)
- message(NOTICE "Skipping the build as the condition \"QT_FEATURE_opengl\" is not met.")
- return()
-endif()
qt_build_repo()
diff --git a/src/quick3d/qquick3d.cpp b/src/quick3d/qquick3d.cpp
index f46215fb..65bdc8a7 100644
--- a/src/quick3d/qquick3d.cpp
+++ b/src/quick3d/qquick3d.cpp
@@ -29,8 +29,10 @@
#include "qquick3d.h"
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qopenglfunctions.h>
+#if QT_CONFIG(opengl)
+# include <QtGui/qopenglcontext.h>
+# include <QtGui/qopenglfunctions.h>
+#endif
#include <QtGui/qoffscreensurface.h>
#include <QtCore/qstring.h>
#include <QtQuick/qquickwindow.h>
@@ -50,7 +52,7 @@
*/
QT_BEGIN_NAMESPACE
-
+#if QT_CONFIG(opengl)
static QSurfaceFormat findIdealGLVersion(int samples)
{
QSurfaceFormat fmt;
@@ -214,7 +216,7 @@ static QSurfaceFormat findIdealGLESVersion(int samples)
qDebug("Unable to find ideal GLES version.");
return fmt;
}
-
+#endif // #if QT_CONFIG(opengl)
/*!
Returns an ideal surface format for the platform. Optionally, \a samples can be specified
to select the number of multisamples for antialiasing.
@@ -226,7 +228,7 @@ QSurfaceFormat QQuick3D::idealSurfaceFormat(int samples)
fmt.setSamples(samples);
return fmt;
}
-
+#if QT_CONFIG(opengl)
static const QSurfaceFormat f = [samples] {
QSurfaceFormat fmt;
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) { // works in dynamic gl builds too because there's a qguiapp already
@@ -239,6 +241,11 @@ QSurfaceFormat QQuick3D::idealSurfaceFormat(int samples)
// Ignore MSAA here as that is a per-layer setting.
return fmt;
}();
+#else
+ // It really shouldn't be possible to get but if we do
+ // but at least return something if we do.
+ QSurfaceFormat f = QSurfaceFormat::defaultFormat();
+#endif //#if QT_CONFIG(opengl)
return f;
}
diff --git a/src/quick3d/qquick3dscenerenderer_p.h b/src/quick3d/qquick3dscenerenderer_p.h
index 19833525..391556e6 100644
--- a/src/quick3d/qquick3dscenerenderer_p.h
+++ b/src/quick3d/qquick3dscenerenderer_p.h
@@ -130,8 +130,6 @@ private:
friend class QQuick3DViewport;
};
-class QOpenGLVertexArrayObjectHelper;
-
namespace QQuick3DRenderLayerHelpers {
Q_QUICK3D_EXPORT void updateLayerNodeHelper(const QQuick3DViewport &view3D, QSSGRenderLayer &layerNode, bool &aaIsDirty, bool &temporalIsDirty, float &ssaaMultiplier);
}
diff --git a/src/quick3d/qquick3dviewport.cpp b/src/quick3d/qquick3dviewport.cpp
index d4d1aaaf..b9f29aa8 100644
--- a/src/quick3d/qquick3dviewport.cpp
+++ b/src/quick3d/qquick3dviewport.cpp
@@ -38,7 +38,6 @@
#include "qquick3dmodel_p.h"
#include "qquick3drenderstats_p.h"
#include <QtQuick3DRuntimeRender/private/qssgrenderlayer_p.h>
-#include <QOpenGLFunctions>
#include <qsgtextureprovider.h>
#include <QSGSimpleTextureNode>
@@ -278,7 +277,7 @@ QSGTextureProvider *QQuick3DViewport::textureProvider() const
return nullptr;
QQuickWindow *w = window();
- if (!w /* || !w->openglContext() || QThread::currentThread() != w->openglContext()->thread() */) {
+ if (!w) {
qWarning("QSSGView3D::textureProvider: can only be queried on the rendering thread of an exposed window");
return nullptr;
}
diff --git a/src/quick3d/qquick3dviewport_p.h b/src/quick3d/qquick3dviewport_p.h
index 1562052e..34a4197b 100644
--- a/src/quick3d/qquick3dviewport_p.h
+++ b/src/quick3d/qquick3dviewport_p.h
@@ -41,7 +41,6 @@
// We mean it.
//
-#include <QOpenGLFramebufferObject>
#include <QtQuick/QQuickItem>
#include <QtCore/qurl.h>
diff --git a/src/runtimerender/qssgrendershadercache.cpp b/src/runtimerender/qssgrendershadercache.cpp
index 4e5a357e..8690ac3a 100644
--- a/src/runtimerender/qssgrendershadercache.cpp
+++ b/src/runtimerender/qssgrendershadercache.cpp
@@ -40,8 +40,9 @@
#include <QtCore/qfile.h>
#include <QtGui/qsurfaceformat.h>
-
-#include <QtGui/qopenglcontext.h>
+#if QT_CONFIG(opengl)
+# include <QtGui/qopenglcontext.h>
+#endif
#include <QtShaderTools/private/qshaderbaker_p.h>
@@ -99,7 +100,11 @@ static void initBaker(QShaderBaker *baker, QRhi::Implementation target)
if (format.profile() == QSurfaceFormat::CoreProfile) {
outputs.append({ QShader::GlslShader, QShaderVersion(330) }); // OpenGL 3.3+
} else {
- if (format.renderableType() == QSurfaceFormat::OpenGLES || QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
+ bool isGLESModule = false;
+#if QT_CONFIG(opengl)
+ isGLESModule = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES;
+#endif
+ if (format.renderableType() == QSurfaceFormat::OpenGLES || isGLESModule) {
if (format.majorVersion() >= 3)
outputs.append({ QShader::GlslShader, QShaderVersion(300, QShaderVersion::GlslEs) }); // GLES 3.0+
else
diff --git a/src/runtimerender/qssgrendershadercodegenerator.cpp b/src/runtimerender/qssgrendershadercodegenerator.cpp
index 718cc7a6..2fc23a39 100644
--- a/src/runtimerender/qssgrendershadercodegenerator.cpp
+++ b/src/runtimerender/qssgrendershadercodegenerator.cpp
@@ -36,8 +36,6 @@
#include <QtQuick3DRuntimeRender/private/qssgrendershaderlibrarymanager_p.h>
#include <QtQuick3DRuntimeRender/private/qssgshaderresourcemergecontext_p.h>
-#include <QtGui/qopengl.h>
-
QT_BEGIN_NAMESPACE
template<typename T>
diff --git a/src/runtimerender/resourcemanager/qssgrenderloadedtexture.cpp b/src/runtimerender/resourcemanager/qssgrenderloadedtexture.cpp
index e09c3827..ac7a57e6 100644
--- a/src/runtimerender/resourcemanager/qssgrenderloadedtexture.cpp
+++ b/src/runtimerender/resourcemanager/qssgrenderloadedtexture.cpp
@@ -34,7 +34,6 @@
#include <QtQuick3DRuntimeRender/private/qssgruntimerenderlogging_p.h>
#include <QtQuick3DRuntimeRender/private/qssgrendertexturedata_p.h>
#include <QtGui/QImage>
-#include <QOpenGLTexture>
#include <QtMath>
#include <QtQuick3DUtils/private/qssgutils_p.h>

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

@ -11,12 +11,10 @@ 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-Enable-build-with-QT_NO_OPENGL.patch \
file://0001-CMake-allow-tools-build-without-opengl.patch \
file://0001-CMake-regenerate-CMakeLists-for-tools.patch \
"
DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-native"
BBCLASSEXTEND =+ "native nativesdk"
@ -27,7 +25,6 @@ _FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "beb1c0b0fa83c151b9f63de6a18229aa5d5e415e"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "0c23c8609285af5bd07aec647cba365a4d8c8027"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"

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

@ -0,0 +1,203 @@
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,6 +10,10 @@ 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 = "2ba4a895a48be6927818008580ab0a88cc8c4e12"
SRCREV = "52ae6b1a506bea501ac7db424edddfa18383d20a"

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

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

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

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

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

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

48
recipes-qt/qt6/qttools/0001-Fix-build-against-latest-qtbase.patch
View File

@ -1,48 +0,0 @@
From 213016e3e0ff9553694bea2eae6f7c8363dc471f Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 24 Aug 2020 17:51:17 +0200
Subject: [PATCH] Fix build against latest qtbase
Change-Id: Id099dbd755815a41e3e19d530c9669a6c73c8731
---
src/designer/src/uitools/quiloader.cpp | 1 -
src/designer/src/uitools/quiloader_p.h | 7 ++++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index ccfd4478..764695a6 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -650,7 +650,6 @@ QUiLoader::QUiLoader(QObject *parent)
static int metaTypeId = 0;
if (!metaTypeId) {
metaTypeId = qRegisterMetaType<QUiTranslatableStringValue>("QUiTranslatableStringValue");
- qRegisterMetaTypeStreamOperators<QUiTranslatableStringValue>("QUiTranslatableStringValue");
}
#endif // QT_NO_DATASTREAM
d->builder.loader = this;
diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h
index 632eb6ef..abf91fd1 100644
--- a/src/designer/src/uitools/quiloader_p.h
+++ b/src/designer/src/uitools/quiloader_p.h
@@ -69,7 +69,7 @@ QT_FORWARD_DECLARE_CLASS(QDataStream)
QT_BEGIN_NAMESPACE
-class QUiTranslatableStringValue
+class Q_UITOOLS_EXPORT QUiTranslatableStringValue
{
public:
QByteArray value() const { return m_value; }
@@ -86,6 +86,11 @@ private:
QByteArray m_qualifier; // Comment or ID for id-based tr().
};
+#ifndef QT_NO_DATASTREAM
+Q_UITOOLS_EXPORT QDataStream &operator<<(QDataStream &out, const QUiTranslatableStringValue &s);
+Q_UITOOLS_EXPORT QDataStream &operator>>(QDataStream &in, QUiTranslatableStringValue &s);
+#endif // QT_NO_DATASTREAM
+
struct QUiItemRolePair {
int realRole;
int shadowRole;

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

@ -12,12 +12,8 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Fix-build-against-latest-qtbase.patch \
"
DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d7e89a71bbbb50122b8175886eed7bdf8a2f6c8d"
SRCREV = "3e67b5e4df84421b77f90cbf242abb4a3c4c93a5"

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 = "25ceb52e58d2c83b54a1c39d77f3594673099abf"
SRCREV = "c7c254c23f5b0162dd4854a8ce0b7b18be974b94"

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 = "67a6ff004798294daf6c88b4ed59e68f716e5129"
SRCREV = "07b2d3e68d5223cd41f0091fea6f2fa036c80ac4"