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
This commit is contained in:
Samuli Piippo 2020-08-14 14:27:18 +03:00
parent 98a375ab0b
commit 6bc33622f8
30 changed files with 926 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
recipes-qt/qt6/qt3d/0001-Update-scene3drenderer-to-latest-changes-in-qtdeclar.patch Normal file
View File

@ -0,0 +1,37 @@
From e45d0c593446abaf537cf778cfc2081b77cacd17 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Fri, 7 Aug 2020 12:51:36 +0200
Subject: [PATCH] Update scene3drenderer to latest changes in qtdeclarative
Change-Id: I9b4a3e3afc1adeda014242ff8fd53ceac9ab5d85
---
src/quick3d/imports/scene3d/scene3drenderer.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index 051f08909..0d5d2cf5c 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -391,8 +391,7 @@ void Scene3DRenderer::GLRenderer::beforeSynchronize(Scene3DRenderer *scene3DRend
if (generateNewTexture) {
m_finalFBO.reset(createFramebufferObject(m_lastSize));
m_textureId = m_finalFBO->texture();
- m_texture.reset(window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, m_textureId,
- 0, m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel));
+ m_texture.reset(QPlatformInterface::QSGOpenGLTexture::fromNative(m_textureId, window, m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel));
}
// We can render either the Scene3D or the Scene3DView but not both
@@ -606,9 +605,9 @@ void Scene3DRenderer::RHIRenderer::beforeSynchronize(Scene3DRenderer *scene3DRen
m_rhiRenderTarget->create();
// Create QSGTexture from QRhiTexture
- m_texture.reset(window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture,
- m_rhiTexture->nativeTexture().object,
- 0, m_lastSize, QQuickWindow::TextureHasAlphaChannel));
+ auto *windowPriv = QQuickWindowPrivate::get(window);
+ m_texture.reset(windowPriv->createTextureFromNativeTexture(m_rhiTexture->nativeTexture().object,
+ 0, m_lastSize, QQuickWindow::TextureHasAlphaChannel));
// Set the Default RenderTarget to use on the RHI Renderer
// Note: this will release all pipelines using previousRenderTarget

3
recipes-qt/qt6/qt3d_git.bb
View File

@ -12,6 +12,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-Update-scene3drenderer-to-latest-changes-in-qtdeclar.patch \
"
DEPENDS = "qtbase qtdeclarative qtshadertools-native"
@ -21,6 +22,6 @@ PACKAGECONFIG_class-target ?= "system-assimp"
PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_assimp=OFF,assimp"
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_qt3d = "c9335062126a65dcaad6c43f24bb6a90db0e0cba"
SRCREV_qt3d = "b807e297beb13532ec09748548e1cfcc5ae6959e"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_FORMAT = "qt3d_assimp"

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

@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6-git.inc
DEPENDS += "qtbase"
SRCREV = "e2d462fee3c2741c16bb4580589a5b5c5eecae53"
SRCREV = "55714b7afb99b1c214e2aa789bfebc3f20e19c5f"

32
recipes-qt/qt6/qtbase/0001-Define-QEvdevKeyMapper-even-without-opengl.patch
View File

@ -1,32 +0,0 @@
From b30c3d579977dada5637cad03a246f68b9fcf45a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 3 Aug 2020 15:28:36 +0300
Subject: [PATCH] Define platform interfaces also without opengl
Fix build without opengl.
Change-Id: I691fd4112d69b16690915fcf33f5ae30ca2d7a93
---
src/gui/platform/unix/qunixplatforminterface.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gui/platform/unix/qunixplatforminterface.cpp b/src/gui/platform/unix/qunixplatforminterface.cpp
index dc8daab217..55650e3efc 100644
--- a/src/gui/platform/unix/qunixplatforminterface.cpp
+++ b/src/gui/platform/unix/qunixplatforminterface.cpp
@@ -83,6 +83,8 @@ QOpenGLContext *QPlatformInterface::QEGLContext::fromNative(EGLContext context,
}
#endif
+#endif // QT_NO_OPENGL
+
#if QT_CONFIG(xcb)
QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QXcbScreen);
QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QXcbWindow);
@@ -102,6 +104,4 @@ QEvdevKeyMapper *QKeyMapper::platformInterface<QEvdevKeyMapper>() const
}
#endif
-#endif // QT_NO_OPENGL
-
QT_END_NAMESPACE

24
recipes-qt/qt6/qtbase/0004-qtbase-allow-paths-outside-of-prefix.patch
View File

@ -1,24 +0,0 @@
From 63cbbffd1545bbf495a3912adfa163445cf04bf9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 20 Mar 2020 09:11:48 +0200
Subject: [PATCH] qtbase: allow paths outside of prefix
Task-number: QTBUG-81289
Change-Id: I0ada0283a31cdf27890b83207f292db38e4e569a
---
cmake/QtBuild.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 84a4db70d5..bfddabd6f9 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -25,7 +25,7 @@ function(qt_configure_process_path name default docstring)
# file(RELATIVE_PATH) returns an empty string if the given absolute paths are equal
set(rel_path ".")
elseif(rel_path MATCHES "^\.\./")
- message(FATAL_ERROR
+ message(WARNING
"Path component '${name}' is outside computed install prefix: ${rel_path} ")
endif()
set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE)

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

@ -16,9 +16,7 @@ include recipes-qt/qt6/qt6-git.inc
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-qtbase-allow-paths-outside-of-prefix.patch \
file://0005-Allow-build-without-opengl.patch \
file://0001-Define-QEvdevKeyMapper-even-without-opengl.patch \
"
DEPENDS += "\
@ -137,4 +135,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "561da776c9f25c567167e0f813ee0c421a96c59f"
SRCREV = "57b94b58df474ebc268993291a669dbad21a1300"

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

@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "a0ab76a6f505fe6cf0e8f08a3166bb9e145596ce"
SRCREV = "55983293291970a341f453b4050acac938d11284"

8
recipes-qt/qt6/qtconnectivity_git.bb
View File

@ -7,16 +7,14 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
inherit qt6-qmake
inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase"
#PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "1bc4e378db9905727005ab23c972154bda3d6a68"
SRCREV = "d9956f03dfc5768a4810a743f92d0a59ef4f3403"

77
recipes-qt/qt6/qtdeclarative/0001-Fix-compilation-with-newer-qtbase.patch
View File

@ -1,77 +0,0 @@
From b7633a0005b78620fc57a9a869c1b82300e7978a Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Mon, 3 Aug 2020 08:49:37 +0200
Subject: [PATCH] Fix compilation with newer qtbase
qstrtod is no longer exported, but instead an inline function. This
replaces the existing forward declarations with an include of the
required private header.
Change-Id: I50bd32557c55dddcb197f163609fd7d5a1b2301b
---
src/qml/parser/qqmljslexer.cpp | 6 ++----
src/quick/items/context2d/qquickcontext2d.cpp | 3 +--
src/quick/util/qquicksvgparser.cpp | 4 ++--
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 601596a9e3..c0ff69c6c4 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -43,16 +43,14 @@
#include <private/qqmljsdiagnosticmessage_p.h>
#include <private/qqmljsmemorypool_p.h>
+#include <private/qlocale_tools_p.h>
+
#include <QtCore/qcoreapplication.h>
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qdebug.h>
#include <QtCore/QScopedValueRollback>
-QT_BEGIN_NAMESPACE
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-QT_END_NAMESPACE
-
using namespace QQmlJS;
static inline int regExpFlagFromChar(const QChar &ch)
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index d705d08f71..5a7af4835e 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -68,6 +68,7 @@
#include <private/qv4functionobject_p.h>
#include <private/qv4objectproto_p.h>
#include <private/qv4scopedvalue_p.h>
+#include <private/qlocale_tools_p.h>
#include <QtCore/qmath.h>
#include <QtCore/qvector.h>
@@ -124,8 +125,6 @@ QT_BEGIN_NAMESPACE
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-
#define CHECK_CONTEXT(r) if (!r || !r->d()->context() || !r->d()->context()->bufferValid()) \
THROW_GENERIC_ERROR("Not a Context2D object");
diff --git a/src/quick/util/qquicksvgparser.cpp b/src/quick/util/qquicksvgparser.cpp
index 0687913565..3e783b26a8 100644
--- a/src/quick/util/qquicksvgparser.cpp
+++ b/src/quick/util/qquicksvgparser.cpp
@@ -43,10 +43,10 @@
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qstring.h>
+#include <private/qlocale_tools_p.h>
+
QT_BEGIN_NAMESPACE
-//copied from Qt SVG (qsvghandler.cpp).
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
// '0' is 0x30 and '9' is 0x39
static inline bool isDigit(ushort ch)
{

6
recipes-qt/qt6/qtdeclarative_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-compilation-with-newer-qtbase.patch \
"
DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "6826b2decc21cbf390076efa3a0d6c412563f94a"
SRCREV = "aaabbf3a7da5dcd729689fc5fa9a31d6f8f2610a"

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

@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "8d0a048e7129618aab5c29423278218c33021be3"
SRCREV = "733873d3ae6ab8be4de5a56dec833bf4e024ce4a"

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 = "87fbd09c2b84c1696c4fd4e8dec544f3cad04265"
SRCREV = "5ff2e91d95ea85ea749e6d8463e06426e4bd10ec"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "433ffd705e5cb5728b77b5d37ae983f45989542e"
SRCREV = "db2e6dad292ec2d4ed3ef34d793a91ebfa1b0c09"

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

@ -24,7 +24,7 @@ _FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "d64c09c8669bd78bac2455f59b9a0d75f87204c7"
SRCREV_qtquick3d = "2a05a1207c0c068c2b141387d06ce72cb7c6367b"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_FORMAT = "qtquick3d_assimp"

348
recipes-qt/qt6/qtquickcontrols2/0001-Fix-event-refactoring-warnings-and-errors.patch
View File

@ -1,348 +0,0 @@
From 9be87ece0b3fc412d244716247b64433bd5d0137 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Fri, 17 Jul 2020 10:52:46 +0200
Subject: [PATCH] Fix event refactoring warnings and errors
Change-Id: I426b4f75066c9db72759398e4d76fd5323044d57
---
src/quicktemplates2/qquickcontrol.cpp | 28 ++++++++++----------
src/quicktemplates2/qquickdial.cpp | 10 +++----
src/quicktemplates2/qquickdrawer.cpp | 12 ++++-----
src/quicktemplates2/qquickoverlay.cpp | 12 ++++-----
src/quicktemplates2/qquickpopup.cpp | 8 +++---
src/quicktemplates2/qquickrangeslider.cpp | 8 +++---
src/quicktemplates2/qquickslider.cpp | 6 ++---
src/quicktemplates2/qquickswitch.cpp | 2 +-
src/quicktemplates2/qquickswitchdelegate.cpp | 2 +-
9 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 8463c60d..22b7f922 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -176,15 +176,15 @@ bool QQuickControlPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
if (point.id() == touchId)
return true;
- if (touchId == -1 && point.state() == Qt::TouchPointPressed) {
+ if (touchId == -1 && point.state() == QEventPoint::Pressed) {
touchId = point.id();
return true;
}
// If the control is on a Flickable that has a pressDelay, then the press is never
// sent as a touch event, therefore we need to check for this case.
- if (touchId == -1 && pressWasTouch && point.state() == Qt::TouchPointReleased &&
- point.pos() == previousPressPos) {
+ if (touchId == -1 && pressWasTouch && point.state() == QEventPoint::Released &&
+ point.position() == previousPressPos) {
return true;
}
return false;
@@ -1953,7 +1953,7 @@ void QQuickControl::hoverEnterEvent(QHoverEvent *event)
void QQuickControl::hoverMoveEvent(QHoverEvent *event)
{
Q_D(QQuickControl);
- setHovered(d->hoverEnabled && contains(event->pos()));
+ setHovered(d->hoverEnabled && contains(event->position()));
event->setAccepted(d->hoverEnabled);
}
@@ -1968,10 +1968,10 @@ void QQuickControl::hoverLeaveEvent(QHoverEvent *event)
void QQuickControl::mousePressEvent(QMouseEvent *event)
{
Q_D(QQuickControl);
- d->handlePress(event->localPos());
+ d->handlePress(event->position());
if (event->source() == Qt::MouseEventSynthesizedByQt) {
d->pressWasTouch = true;
- d->previousPressPos = event->localPos();
+ d->previousPressPos = event->position();
}
event->accept();
}
@@ -1979,14 +1979,14 @@ void QQuickControl::mousePressEvent(QMouseEvent *event)
void QQuickControl::mouseMoveEvent(QMouseEvent *event)
{
Q_D(QQuickControl);
- d->handleMove(event->localPos());
+ d->handleMove(event->position());
event->accept();
}
void QQuickControl::mouseReleaseEvent(QMouseEvent *event)
{
Q_D(QQuickControl);
- d->handleRelease(event->localPos());
+ d->handleRelease(event->position());
event->accept();
}
@@ -2009,14 +2009,14 @@ void QQuickControl::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointPressed:
- d->handlePress(point.pos());
+ case QEventPoint::Pressed:
+ d->handlePress(point.position());
break;
- case Qt::TouchPointMoved:
- d->handleMove(point.pos());
+ case QEventPoint::Updated:
+ d->handleMove(point.position());
break;
- case Qt::TouchPointReleased:
- d->handleRelease(point.pos());
+ case QEventPoint::Released:
+ d->handleRelease(point.position());
break;
default:
break;
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 99bd0e98..e011891f 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -735,7 +735,7 @@ void QQuickDial::mousePressEvent(QMouseEvent *event)
{
Q_D(QQuickDial);
QQuickControl::mousePressEvent(event);
- d->handleMove(event->localPos());
+ d->handleMove(event->position());
setKeepMouseGrab(true);
}
@@ -750,18 +750,18 @@ void QQuickDial::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
if (!keepTouchGrab()) {
- bool overXDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.pos().x() - d->pressPoint.x(), Qt::XAxis, &point);
+ bool overXDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point);
setKeepTouchGrab(overXDragThreshold);
if (!overXDragThreshold) {
- bool overYDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.pos().y() - d->pressPoint.y(), Qt::YAxis, &point);
+ bool overYDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.position().y() - d->pressPoint.y(), Qt::YAxis, &point);
setKeepTouchGrab(overYDragThreshold);
}
}
if (keepTouchGrab())
- d->handleMove(point.pos());
+ d->handleMove(point.position());
break;
default:
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 433346ba..47b69161 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -305,7 +305,7 @@ bool QQuickDrawerPrivate::startDrag(QEvent *event)
switch (event->type()) {
case QEvent::MouseButtonPress:
- if (isWithinDragMargin(q, static_cast<QMouseEvent *>(event)->windowPos())) {
+ if (isWithinDragMargin(q, static_cast<QMouseEvent *>(event)->scenePosition())) {
prepareEnterTransition();
reposition();
return handleMouseEvent(window->contentItem(), static_cast<QMouseEvent *>(event));
@@ -316,7 +316,7 @@ bool QQuickDrawerPrivate::startDrag(QEvent *event)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->touchPoints()) {
- if (point.state() == Qt::TouchPointPressed && isWithinDragMargin(q, point.scenePos())) {
+ if (point.state() == QEventPoint::Pressed && isWithinDragMargin(q, point.scenePosition())) {
prepareEnterTransition();
reposition();
return handleTouchEvent(window->contentItem(), static_cast<QTouchEvent *>(event));
@@ -345,7 +345,7 @@ bool QQuickDrawerPrivate::grabMouse(QQuickItem *item, QMouseEvent *event)
if (!window || !interactive || keepGrab(popupItem) || keepGrab(item))
return false;
- const QPointF movePoint = event->windowPos();
+ const QPointF movePoint = event->scenePosition();
// Flickable uses a hard-coded threshold of 15 for flicking, and
// QStyleHints::startDragDistance for dragging. Drawer uses a bit
@@ -384,15 +384,15 @@ bool QQuickDrawerPrivate::grabTouch(QQuickItem *item, QTouchEvent *event)
Q_Q(QQuickDrawer);
bool handled = handleTouchEvent(item, event);
- if (!window || !interactive || keepGrab(popupItem) || keepGrab(item) || !event->touchPointStates().testFlag(Qt::TouchPointMoved))
+ if (!window || !interactive || keepGrab(popupItem) || keepGrab(item) || !event->touchPointStates().testFlag(QEventPoint::Updated))
return handled;
bool overThreshold = false;
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (!acceptTouch(point) || point.state() != Qt::TouchPointMoved)
+ if (!acceptTouch(point) || point.state() != QEventPoint::Updated)
continue;
- const QPointF movePoint = point.scenePos();
+ const QPointF movePoint = point.scenePosition();
// Flickable uses a hard-coded threshold of 15 for flicking, and
// QStyleHints::startDragDistance for dragging. Drawer uses a bit
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index 5cb1ab0b..4d272bff 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -217,16 +217,16 @@ bool QQuickOverlayPrivate::handleTouchEvent(QQuickItem *source, QTouchEvent *eve
case QEvent::TouchEnd:
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
if (!target && startDrag(event, point.scenePosition()))
handled = true;
else
handled |= handlePress(source, event, target);
break;
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
handled |= handleMove(source, event, target ? target : mouseGrabberPopup.data());
break;
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
handled |= handleRelease(source, event, target ? target : mouseGrabberPopup.data());
break;
default:
@@ -496,15 +496,15 @@ bool QQuickOverlay::eventFilter(QObject *object, QEvent *event)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
- if (static_cast<QTouchEvent *>(event)->touchPointStates() & Qt::TouchPointPressed)
+ if (static_cast<QTouchEvent *>(event)->touchPointStates() & QEventPoint::Pressed)
emit pressed();
- if (static_cast<QTouchEvent *>(event)->touchPointStates() & Qt::TouchPointReleased)
+ if (static_cast<QTouchEvent *>(event)->touchPointStates() & QEventPoint::Released)
emit released();
// allow non-modal popups to close on touch release outside
if (!d->mouseGrabberPopup) {
for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->touchPoints()) {
- if (point.state() == Qt::TouchPointReleased) {
+ if (point.state() == QEventPoint::Released) {
if (d->handleRelease(d->window->contentItem(), event, nullptr))
break;
}
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 1d6f125e..57b93036 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -313,7 +313,7 @@ bool QQuickPopupPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
if (point.id() == touchId)
return true;
- if (touchId == -1 && point.state() != Qt::TouchPointReleased) {
+ if (touchId == -1 && point.state() != QEventPoint::Released) {
touchId = point.id();
return true;
}
@@ -395,11 +395,11 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event)
return blockInput(item, point.position());
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
return handlePress(item, item->mapToScene(point.position()), event->timestamp());
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
return handleMove(item, item->mapToScene(point.position()), event->timestamp());
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
return handleRelease(item, item->mapToScene(point.position()), event->timestamp());
default:
break;
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 2b0f2961..af95d463 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -458,7 +458,7 @@ bool QQuickRangeSliderPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
int firstId = QQuickRangeSliderNodePrivate::get(first)->touchId;
int secondId = QQuickRangeSliderNodePrivate::get(second)->touchId;
- if (((firstId == -1 || secondId == -1) && point.state() == Qt::TouchPointPressed) || point.id() == firstId || point.id() == secondId) {
+ if (((firstId == -1 || secondId == -1) && point.state() == QEventPoint::Pressed) || point.id() == firstId || point.id() == secondId) {
touchId = point.id();
return true;
}
@@ -1196,10 +1196,10 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
d->handlePress(point.position());
break;
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
if (!keepTouchGrab()) {
if (d->orientation == Qt::Horizontal)
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - point.pressPosition().x(), Qt::XAxis, &point, qRound(d->touchDragThreshold)));
@@ -1209,7 +1209,7 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
if (keepTouchGrab())
d->handleMove(point.position());
break;
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
d->handleRelease(point.position());
break;
default:
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 9d223f25..dcff5420 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -805,10 +805,10 @@ void QQuickSlider::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
d->handlePress(point.position());
break;
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
if (!keepTouchGrab()) {
if (d->orientation == Qt::Horizontal)
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point, qRound(d->touchDragThreshold)));
@@ -818,7 +818,7 @@ void QQuickSlider::touchEvent(QTouchEvent *event)
if (keepTouchGrab())
d->handleMove(point.position());
break;
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
d->handleRelease(point.position());
break;
default:
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 2bba350d..143210ae 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -193,7 +193,7 @@ void QQuickSwitch::touchEvent(QTouchEvent *event)
Q_D(QQuickSwitch);
if (!keepTouchGrab() && event->type() == QEvent::TouchUpdate) {
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (point.id() != d->touchId || point.state() != Qt::TouchPointMoved)
+ if (point.id() != d->touchId || point.state() != QEventPoint::Updated)
continue;
if (d->canDrag(point.position()))
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point));
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 3300e252..2e196412 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -190,7 +190,7 @@ void QQuickSwitchDelegate::touchEvent(QTouchEvent *event)
Q_D(QQuickSwitchDelegate);
if (!keepTouchGrab() && event->type() == QEvent::TouchUpdate) {
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (point.id() != d->touchId || point.state() != Qt::TouchPointMoved)
+ if (point.id() != d->touchId || point.state() != QEventPoint::Updated)
continue;
if (d->canDrag(point.position()))
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point));
--
2.17.1

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

@ -10,14 +10,10 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Fix-event-refactoring-warnings-and-errors.patch \
"
DEPENDS = "qtbase qtdeclarative"
do_configure_prepend() {
sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt
}
SRCREV = "49ffc6e6af83b295c67fd119b79c925879cc292e"
SRCREV = "0ba45442f3f1102af73ec2666e4e5c24ed516331"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "cfb1f2406f06103fbb8aa1c8f5213b7136ae52b5"
SRCREV = "501f7961eb31c1e3391ff6ca87b071c77b33f42d"

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

@ -15,4 +15,4 @@ DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
BBCLASSEXTEND += "native nativesdk"
SRCREV = "4514cea46087a51f25683f36e6fb5ee8069dde21"
SRCREV = "41b9a8f1ea833bc016486c7d1f835b2d6c67d4cd"

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

@ -14,4 +14,4 @@ DEPENDS += "qtbase qtdeclarative qtscxml-native"
BBCLASSEXTEND += "native nativesdk"
SRCREV = "98d5b12c39ea442f3826ac2cac345b9d5422f61a"
SRCREV = "2427b675711119c6aac68b662434eb8a0910c3a3"

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

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "348efeb67944de06cf162a4d5c221a9f524de17e"
SRCREV = "2cc24b745074996af0f36eb6a9666faf510e7e83"

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

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "0bf8665aa4b90c004fce9314f9fdbed4c94598a5"
SRCREV = "c484d432a0980a89c9faf95e41b8bd224aaf114f"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "e03ad18db9a40590fa88cd2b10fa1b681f7ee2da"
SRCREV = "5eff30a3aff2bcd1c46bd76922a8280829dd5152"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "819983972f3e8d7062c94d073b83ee7821a188ab"
SRCREV = "a553ba77e528d05df5012ab7cd620f861080a6b1"

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

@ -122,4 +122,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "e409ba186bcd670e7741740c410a32f35b1dbe2e"
SRCREV = "bbb35e000f2298ab5d3fc14d52a550ed80cd6b05"

23
recipes-qt/qt6/qtwayland/0001-Adapt-to-API-change-in-qtdeclarative.patch Normal file
View File

@ -0,0 +1,23 @@
From a7defee7a55933ff975a7ebbe564830125d42f0b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 13 Aug 2020 10:55:17 +0300
Subject: [PATCH] Adapt to API change in qtdeclarative
---
src/compositor/compositor_api/qwaylandquickitem.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 45431cfa..be1d3012 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -300,7 +300,8 @@ public:
auto texture = buffer.toOpenGLTexture();
GLuint textureId = texture->textureId();
auto size = surface->bufferSize();
- m_sgTex = surfaceItem->window()->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, textureId, 0, size, opt);
+ auto *windowPriv = QQuickWindowPrivate::get(surfaceItem->window());
+ m_sgTex = windowPriv->createTextureFromNativeTexture(textureId, 0, size, opt);
#else
qCWarning(qLcWaylandCompositor) << "Without OpenGL support only shared memory textures are supported";
#endif

8
recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch
View File

@ -1,4 +1,4 @@
From 01785d3180c6f9b65f06a41a339992aa828aedda Mon Sep 17 00:00:00 2001
From 02e3028f4ea5e39dbc7fbe3032258ed7319b6bc2 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 29 Jan 2020 12:39:09 +0200
Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
@ -10,7 +10,7 @@ Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88223a41..fe218863 100644
index e72c5e1c..771532da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,11 +26,11 @@ endif()
@ -18,14 +18,14 @@ index 88223a41..fe218863 100644
Core
Gui
- OpenGL
PlatformHeaders
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
+ OpenGL
Quick
+ OpenGL
)
# special case end
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e60f0ba..4b2639e3 100644
--- a/src/CMakeLists.txt

835
recipes-qt/qt6/qtwayland/0001-Update-to-match-qtbase-changes-to-platform-headers.patch Normal file
View File

@ -0,0 +1,835 @@
From 9f2a6a018bff6b5ec98145444a7d0b5390a4afbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 5 Aug 2020 12:27:10 +0200
Subject: [PATCH] Update to match qtbase changes to platform headers
Change-Id: I8e39d87361728c81b526f1ad89b45136500c9913
---
CMakeLists.txt | 1 -
src/client/CMakeLists.txt | 1 -
src/client/client.pro | 2 -
src/client/qwaylandnativeinterface.cpp | 40 -----
src/client/qwaylandnativeinterface_p.h | 6 -
.../vsp2/vsp2hardwarelayerintegration.cpp | 26 ++--
.../vsp2/vsp2hardwarelayerintegration.h | 6 +-
tests/manual/subsurface/CMakeLists.txt | 35 -----
tests/manual/subsurface/child.qml | 77 ----------
tests/manual/subsurface/main.cpp | 141 ------------------
tests/manual/subsurface/main.qml | 100 -------------
tests/manual/subsurface/qml.qrc | 6 -
tests/manual/subsurface/shmwindow.cpp | 84 -----------
tests/manual/subsurface/shmwindow.h | 70 ---------
tests/manual/subsurface/subsurface.pro | 17 ---
15 files changed, 22 insertions(+), 590 deletions(-)
delete mode 100644 tests/manual/subsurface/CMakeLists.txt
delete mode 100644 tests/manual/subsurface/child.qml
delete mode 100644 tests/manual/subsurface/main.cpp
delete mode 100644 tests/manual/subsurface/main.qml
delete mode 100644 tests/manual/subsurface/qml.qrc
delete mode 100644 tests/manual/subsurface/shmwindow.cpp
delete mode 100644 tests/manual/subsurface/shmwindow.h
delete mode 100644 tests/manual/subsurface/subsurface.pro
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88223a41..e72c5e1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
Core
Gui
OpenGL
- PlatformHeaders
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index b49a7292..88b27b5f 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -56,7 +56,6 @@ qt_add_module(WaylandClient
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
- Qt::PlatformHeadersPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
diff --git a/src/client/client.pro b/src/client/client.pro
index 38b129e9..d6df946b 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -3,8 +3,6 @@ MODULE = waylandclient
QT += core-private gui-private
-QT_PRIVATE += platformheaders-private
-
# We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp
index da788547..2c9ba899 100644
--- a/src/client/qwaylandnativeinterface.cpp
+++ b/src/client/qwaylandnativeinterface.cpp
@@ -55,8 +55,6 @@
#include <QtWaylandClient/private/qwaylandvulkanwindow_p.h>
#endif
-#include <QtPlatformHeaders/private/qwaylandwindowfunctions_p.h>
-
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
@@ -194,44 +192,6 @@ void QWaylandNativeInterface::emitWindowPropertyChanged(QPlatformWindow *window,
emit windowPropertyChanged(window,name);
}
-QFunctionPointer QWaylandNativeInterface::platformFunction(const QByteArray &resource) const
-{
- if (resource == QWaylandWindowFunctions::setSyncIdentifier()) {
- return QFunctionPointer(setSync);
- } else if (resource == QWaylandWindowFunctions::setDeSyncIdentifier()) {
- return QFunctionPointer(setDeSync);
- } else if (resource == QWaylandWindowFunctions::isSyncIdentifier()) {
- return QFunctionPointer(isSync);
- }
- return nullptr;
-}
-
-
-void QWaylandNativeInterface::setSync(QWindow *window)
-{
- QWaylandWindow *ww = static_cast<QWaylandWindow*>(window->handle());
- if (ww->subSurfaceWindow()) {
- ww->subSurfaceWindow()->setSync();
- }
-}
-
-void QWaylandNativeInterface::setDeSync(QWindow *window)
-{
- QWaylandWindow *ww = static_cast<QWaylandWindow*>(window->handle());
- if (ww->subSurfaceWindow()) {
- ww->subSurfaceWindow()->setDeSync();
- }
-}
-
-bool QWaylandNativeInterface::isSync(QWindow *window)
-{
- QWaylandWindow *ww = static_cast<QWaylandWindow*>(window->handle());
- if (ww->subSurfaceWindow()) {
- return ww->subSurfaceWindow()->isSync();
- }
- return false;
-}
-
}
QT_END_NAMESPACE
diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h
index 3de80eb6..0edbdc9e 100644
--- a/src/client/qwaylandnativeinterface_p.h
+++ b/src/client/qwaylandnativeinterface_p.h
@@ -82,15 +82,9 @@ public:
void emitWindowPropertyChanged(QPlatformWindow *window, const QString &name);
- QFunctionPointer platformFunction(const QByteArray &resource) const override;
-
private:
QWaylandIntegration *m_integration = nullptr;
QHash<QPlatformWindow*, QVariantMap> m_windowProperties;
-
- static void setSync(QWindow *window);
- static void setDeSync(QWindow *window);
- static bool isSync(QWindow *window);
};
}
diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
index a0abf697..ad25d88f 100644
--- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
+++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
@@ -41,7 +41,9 @@ extern "C" {
#include <QWaylandQuickOutput>
#include <QQuickWindow>
-#include <QtPlatformHeaders/qeglfsfunctions.h>
+#include <qpa/qlatformscreen_p.h>
+
+using namespace QPlatformInterface::Private;
QT_BEGIN_NAMESPACE
@@ -56,6 +58,10 @@ Vsp2Buffer::Vsp2Buffer(wl_kms_buffer *kmsBuffer)
Vsp2Layer::Vsp2Layer(QWaylandQuickHardwareLayer *hwLayer, Vsp2HardwareLayerIntegration *integration)
: m_hwLayer(hwLayer)
{
+ auto *wlItem = m_hwLayer->waylandItem();
+ m_screen = dynamic_cast<QVsp2Screen*>(wlItem->window()->screen()->handle());
+ Q_ASSERT(m_screen);
+
connect(hwLayer, &QWaylandQuickHardwareLayer::stackingLevelChanged, this, [integration](){
integration->recreateVspLayers();
});
@@ -76,16 +82,17 @@ void Vsp2Layer::enableVspLayer()
m_buffer = Vsp2Buffer(kmsBuffer);
updatePosition();
+
+ m_layerIndex = m_screen->addLayer(m_buffer.dmabufFd, m_buffer.size, m_position, m_buffer.drmPixelFormat, m_buffer.bytesPerLine);
+
auto *wlItem = m_hwLayer->waylandItem();
- m_screen = wlItem->window()->screen();
- m_layerIndex = QEglFSFunctions::vsp2AddLayer(m_screen, m_buffer.dmabufFd, m_buffer.size, m_position, m_buffer.drmPixelFormat, m_buffer.bytesPerLine);
wlItem->surface()->frameStarted();
updateOpacity();
}
void Vsp2Layer::disableVspLayer()
{
- QEglFSFunctions::vsp2RemoveLayer(m_screen, m_layerIndex);
+ m_screen->removeLayer(m_layerIndex);
m_layerIndex = -1;
m_screen = nullptr;
}
@@ -112,9 +119,9 @@ void Vsp2Layer::handleBufferCommitted()
}
m_buffer = newBuffer;
+ m_screen->setLayerBuffer(m_layerIndex, m_buffer.dmabufFd);
+
auto *wlItem = m_hwLayer->waylandItem();
- m_screen = wlItem->window()->screen();
- QEglFSFunctions::vsp2SetLayerBuffer(m_screen, m_layerIndex, m_buffer.dmabufFd);
wlItem->surface()->frameStarted();
}
@@ -147,14 +154,14 @@ void Vsp2Layer::updatePosition()
m_position = globalGeometry.topLeft().toPoint();
if (isEnabled())
- QEglFSFunctions::vsp2SetLayerPosition(m_screen, m_layerIndex, m_position);
+ m_screen->setLayerPosition(m_layerIndex, m_position);
}
void Vsp2Layer::updateOpacity()
{
if (isEnabled()) {
qreal opacity = m_hwLayer->waylandItem()->opacity();
- QEglFSFunctions::vsp2SetLayerAlpha(m_screen, m_layerIndex, opacity);
+ m_screen->setLayerAlpha(m_layerIndex, opacity);
}
}
@@ -216,7 +223,8 @@ Vsp2HardwareLayerIntegration::Vsp2HardwareLayerIntegration()
<< "You need to set QT_QPA_PLATFORM=eglfs and QT_QPA_EGLFS_INTEGRATION=eglfs_kms_vsp2";
}
static Vsp2HardwareLayerIntegration *s_instance = this;
- QEglFSFunctions::vsp2AddBlendListener(QGuiApplication::primaryScreen(), [](){
+ auto screen = dynamic_cast<QVsp2Screen*>(QGuiApplication::primaryScreen()->handle());
+ screen->addBlendListener([](){
s_instance->sendFrameCallbacks();
});
}
diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
index 263c5026..f72bbc3e 100644
--- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
+++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
@@ -40,6 +40,10 @@ struct wl_kms_buffer;
QT_BEGIN_NAMESPACE
+namespace QPlatformInterface::Private {
+struct QVsp2Screen;
+}
+
class QScreen;
class QWaylandSurface;
class QWaylandQuickHardwareLayer;
@@ -95,7 +99,7 @@ public slots:
private:
wl_kms_buffer *nextKmsBuffer();
int m_layerIndex = -1;
- QScreen *m_screen = nullptr;
+ QVsp2Screen *m_screen = nullptr;
QPoint m_position;
QWaylandQuickHardwareLayer *m_hwLayer = nullptr;
QWaylandSurface *m_surface = nullptr;
diff --git a/tests/manual/subsurface/CMakeLists.txt b/tests/manual/subsurface/CMakeLists.txt
deleted file mode 100644
index fd450f20..00000000
--- a/tests/manual/subsurface/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated from subsurface.pro.
-
-#####################################################################
-## subsurface Binary:
-#####################################################################
-
-qt_add_manual_test(subsurface
- GUI
- SOURCES
- main.cpp
- shmwindow.cpp shmwindow.h
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::Gui
- Qt::GuiPrivate
- Qt::Quick
- Qt::WaylandClient
-)
-
-# Resources:
-set(qml_resource_files
- "child.qml"
- "main.qml"
-)
-
-qt_add_resource(subsurface "qml"
- PREFIX
- "/"
- FILES
- ${qml_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:subsurface.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/manual/subsurface/child.qml b/tests/manual/subsurface/child.qml
deleted file mode 100644
index f1bdd66e..00000000
--- a/tests/manual/subsurface/child.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 LG Electronics Inc, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-
-Rectangle {
- width: 300
- height: 300
-
- color: "darkgray"
-
- Rectangle {
- width: 100
- height: 100
- color: "magenta"
-
- Text {
- anchors.centerIn: parent
- text: "quick"
- }
-
- RotationAnimation on rotation {
- duration: 10000
- loops: Animation.Infinite
- from: 0
- to: 360
- }
- }
-}
diff --git a/tests/manual/subsurface/main.cpp b/tests/manual/subsurface/main.cpp
deleted file mode 100644
index 375e5d2b..00000000
--- a/tests/manual/subsurface/main.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 LG Electronics Inc, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QGuiApplication>
-#include <QQmlEngine>
-#include <QQmlFileSelector>
-#include <QQmlContext>
-#include <QQuickView>
-
-#include <QtPlatformHeaders/qwaylandwindowfunctions.h>
-
-#include "shmwindow.h"
-
-class Filter : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(bool sync READ getSync NOTIFY syncChanged)
-
-public:
- Filter()
- {
- sync = false;
- }
-
- bool eventFilter(QObject *object, QEvent *event)
- {
- Q_UNUSED(object);
- if (event->type() == QEvent::KeyPress) {
- QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
- if (keyEvent->key() == Qt::Key_Space) {
- toggleSync(quick);
- toggleSync(shm);
- }
- }
- return false;
- }
-
- void toggleSync(QWindow *w)
- {
- sync = !QWaylandWindowFunctions::isSync(w);
- if (QWaylandWindowFunctions::isSync(w))
- QWaylandWindowFunctions::setDeSync(w);
- else
- QWaylandWindowFunctions::setSync(w);
- emit syncChanged();
- }
-
- bool getSync() const
- {
- return sync;
- }
-
-Q_SIGNALS:
- void syncChanged();
-
-public:
- QWindow *quick;
- QWindow *shm;
- bool sync;
-};
-
-int main(int argc, char* argv[])
-{
- QGuiApplication app(argc, argv);
- QQuickView view;
- view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));
- view.setResizeMode(QQuickView::SizeRootObjectToView);
-
- Filter f;
- view.rootContext()->setContextProperty("syncStatus", &f);
- view.installEventFilter(&f);
-
- view.setSource(QUrl("qrc:/main.qml"));
- view.show();
-
- QQuickView child(&view);
- child.connect(child.engine(), SIGNAL(quit()), &app, SLOT(quit()));
- child.setSource(QUrl("qrc:/child.qml"));
- child.setResizeMode(QQuickView::SizeRootObjectToView);
- child.setGeometry(QRect(150, 70, 100, 100));
- child.show();
-
- ShmWindow shm(&view);
- shm.setGeometry(QRect(30, 30, 50, 50));
- shm.show();
-
- f.quick = &child;
- f.shm = &shm;
-
- return app.exec();
-}
-
-#include "main.moc"
-
diff --git a/tests/manual/subsurface/main.qml b/tests/manual/subsurface/main.qml
deleted file mode 100644
index 8c27ac78..00000000
--- a/tests/manual/subsurface/main.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 LG Electronics Inc, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-
-Rectangle {
- id: root
-
- width: 300
- height: 300
-
- color: "blue"
-
- Rectangle {
- id: r
- width: 100
- height: 100
- x: (parent.width - width) / 2
- y: (parent.height - height) / 2
- color: "cyan"
-
- MouseArea {
- anchors.fill: parent
- drag.target: r
- drag.axis: Drag.XAndYAxis
- }
- }
-
- Text {
- anchors.bottom: parent.bottom
- anchors.horizontalCenter: parent.horizontalCenter
- text: syncStatus.sync ? "sync mode" : "de-sync mode"
- }
-
- // If you can see these rectangles, something's not right
- Rectangle {
- //Child at (150, 70, 100, 100)
- color: "yellow"
- x: 150
- y: 70
- width:100
- height:100
- }
- Rectangle {
- //Shm at (30, 30, 50, 50)
- color: "yellow"
- x: 30
- y: 30
- width: 50
- height: 50
- }
-}
diff --git a/tests/manual/subsurface/qml.qrc b/tests/manual/subsurface/qml.qrc
deleted file mode 100644
index f81739af..00000000
--- a/tests/manual/subsurface/qml.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
- <file>main.qml</file>
- <file>child.qml</file>
-</qresource>
-</RCC>
diff --git a/tests/manual/subsurface/shmwindow.cpp b/tests/manual/subsurface/shmwindow.cpp
deleted file mode 100644
index 32358210..00000000
--- a/tests/manual/subsurface/shmwindow.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 LG Electronics Ltd, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "shmwindow.h"
-
-#include <QPainter>
-#include <QDebug>
-
-ShmWindow::ShmWindow(QWindow *parent)
- : QRasterWindow(parent)
- , m_rotation(0)
-{
- m_timer = startTimer(100);
-}
-
-void ShmWindow::timerEvent(QTimerEvent *event)
-{
- if (event->timerId() == m_timer) {
- m_rotation++;
- update();
- }
-}
-
-void ShmWindow::paintEvent(QPaintEvent *event)
-{
- Q_UNUSED(event);
- QPainter painter(this);
-
- painter.fillRect(0, 0, width(), height(), Qt::white);
-
- qreal xc = width() * 0.5;
- qreal yc = height() * 0.5;
- painter.translate(xc, yc);
- painter.rotate(m_rotation);
- painter.drawText(QRectF(-xc, -yc, width(), height()), Qt::AlignCenter, QStringLiteral("SHM"));
-}
-
diff --git a/tests/manual/subsurface/shmwindow.h b/tests/manual/subsurface/shmwindow.h
deleted file mode 100644
index 10041eea..00000000
--- a/tests/manual/subsurface/shmwindow.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 LG Electronics Ltd, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SHMWINDOW_H
-#define SHMWINDOW_H
-
-#include <QtGui>
-
-class ShmWindow : public QRasterWindow
-{
- Q_OBJECT
-public:
- explicit ShmWindow(QWindow *parent);
-
-protected:
- void paintEvent(QPaintEvent *event) override;
- void timerEvent(QTimerEvent *) override;
-
-private:
- int m_rotation;
- int m_timer;
-};
-#endif // SHMWINDOW_H
diff --git a/tests/manual/subsurface/subsurface.pro b/tests/manual/subsurface/subsurface.pro
deleted file mode 100644
index 5371ac5f..00000000
--- a/tests/manual/subsurface/subsurface.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-
-QT += \
- gui gui-private core-private\
- quick \
- waylandclient \
-
-HEADERS += \
- shmwindow.h \
-
-SOURCES += \
- main.cpp \
- shmwindow.cpp \
-
-RESOURCES += \
- qml.qrc
-

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

@ -13,7 +13,9 @@ include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI +="\
file://0001-Update-to-match-qtbase-changes-to-platform-headers.patch \
file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
file://0001-Adapt-to-API-change-in-qtdeclarative.patch \
"
PACKAGECONFIG ?= "\
@ -37,4 +39,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "466a6da2a2667e780f96a461875573fc8e5964da"
SRCREV = "2e329455193caf40785aa5081f50a2c4f275be88"

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

@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtwebsockets"
SRCREV = "db70dab3c1b6ac099fc33b0aeb8de8b574073548"
SRCREV = "a1d717d881f6f1e72cf2643826b6025c1d16d7f6"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "406fd60aa4ef1852eec6ae3b9cb5a724855d91e9"
SRCREV = "a9a7d475d58ddc24ffb1b7e2414a9095c79e842e"