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: I05b4cf49d8da6d65d263f3e2e3f3d42ff1a0f0ec
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2020-09-04 08:00:42 +03:00
parent a43c7553b9
commit a37fb5e1a0
37 changed files with 422 additions and 1106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb
View File

@ -14,6 +14,8 @@ RDEPENDS_${PN} += " \
nativesdk-qtbase-tools \
nativesdk-qtdeclarative-dev \
nativesdk-qtdeclarative-tools \
nativesdk-qtquick3d-dev \
nativesdk-qtquick3d-tools \
nativesdk-qttools-dev \
nativesdk-qttools-tools \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \

2
recipes-qt/packagegroups/packagegroup-qt6-modules.bb
View File

@ -18,7 +18,7 @@ RDEPENDS_${PN} += " \
qtmqtt \
qtnetworkauth \
qtopcua \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d', '', d)} \
qtquick3d \
qtquickcontrols2 \
qtquicktimeline \
qtserialbus \

1
recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb
View File

@ -19,7 +19,6 @@ RDEPENDS_${PN} += "\
qtmqtt-dev \
qtnetworkauth-dev \
qtopcua-dev \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d-dev', '', d)} \
qtquick3d-dev \
qtquickcontrols2-dev \
qtquicktimeline-dev \

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

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

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

@ -15,7 +15,6 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += " \
git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
file://0001-Update-scene3drenderer-to-latest-changes-in-qtdeclar.patch \
"
DEPENDS = "qtbase qtdeclarative qtshadertools-native"
@ -25,6 +24,6 @@ PACKAGECONFIG_class-target ?= "system-assimp"
PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_assimp=OFF,assimp"
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_qt3d = "b807e297beb13532ec09748548e1cfcc5ae6959e"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_qt3d = "f248b8a3bce2e7f0842f51ab7665f3efc3c9274e"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
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 = "55714b7afb99b1c214e2aa789bfebc3f20e19c5f"
SRCREV = "d675a522d6ab75509abd49a917ab8b424c393834"

24
recipes-qt/qt6/qtbase/0001-CMake-use-definitions-when-testing-EGL.patch
View File

@ -1,24 +0,0 @@
From 1c1a22552ab587408d8c5775847e72891f698c90 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 24 Aug 2020 11:10:17 +0300
Subject: [PATCH] CMake: use definitions when testing EGL
Use any definition from pkgconfig for the EGL compilation test.
Change-Id: I95c659b87ab7b0de81f000e3f52195161a493ef5
---
cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
index 55ca2a99bd..16dc1768ea 100644
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
@@ -118,6 +118,7 @@ endif()
cmake_push_check_state(RESET)
list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}")
+list(APPEND CMAKE_REQUIRED_DEFINITIONS "${EGL_DEFINITIONS}")
check_cxx_source_compiles("
#include <EGL/egl.h>

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

@ -17,7 +17,6 @@ SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0005-Allow-build-without-opengl.patch \
file://0001-CMake-use-definitions-when-testing-EGL.patch \
"
DEPENDS += "\
@ -141,4 +140,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "57b94b58df474ebc268993291a669dbad21a1300"
SRCREV = "eb7d1cf098df56f8ebf62f02af611a627435a4a1"

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

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

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

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

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

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

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

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

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

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

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

23
recipes-qt/qt6/qtopcua/0001-Add-missing-include.patch
View File

@ -1,23 +0,0 @@
From 6a6c3dd0e16b6df075dd3c5e1bdf05b67df6f5a1 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 14 Aug 2020 13:54:43 +0300
Subject: [PATCH] Add missing include
Change-Id: I033b13f051775b0a5e383499ccee28069617df0a
---
src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp b/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp
index 86bad2e..c8bd343 100644
--- a/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp
+++ b/src/opcua/x509/qopcuax509extensionsubjectalternativename.cpp
@@ -34,6 +34,8 @@
**
****************************************************************************/
+#include <QVector>
+
#include "qopcuax509extensionsubjectalternativename.h"
#include "qopcuax509extension_p.h"

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

@ -10,10 +10,6 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Add-missing-include.patch \
"
PACKAGECONFIG ?= "qtdeclarative"
PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
PACKAGECONFIG[examples] = "-DBUILD_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,qtquickcontrols2"
@ -23,6 +19,6 @@ PACKAGECONFIG[examples] = "-DBUILD_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,qtquickcont
# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase qtdeclarative"
DEPENDS += "qtbase"
SRCREV = "71a9fe798178633cc0b9a12d20ad7b609546d1e0"
SRCREV = "e851fb766021277d64b013a1594c5471f4fba55a"

35
recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch Normal file
View File

@ -0,0 +1,35 @@
From 2a86d7934907f8abc9f9d90885673532ba7a2d79 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 28 Aug 2020 14:49:11 +0300
Subject: [PATCH] CMake: allow tools build without opengl
Change-Id: I76d750b5bd29103133578152241c11bc35b14552
---
tools/balsam/CMakeLists.txt | 1 -
tools/meshdebug/CMakeLists.txt | 1 -
2 files changed, 2 deletions(-)
diff --git a/tools/balsam/CMakeLists.txt b/tools/balsam/CMakeLists.txt
index 55a090de..7b09f0b4 100644
--- a/tools/balsam/CMakeLists.txt
+++ b/tools/balsam/CMakeLists.txt
@@ -10,7 +10,6 @@ qt_add_tool(balsam
main.cpp
PUBLIC_LIBRARIES
Qt::Qml # special case
- Qt::OpenGL # special case
Qt::Gui
Qt::Quick3DAssetImportPrivate
)
diff --git a/tools/meshdebug/CMakeLists.txt b/tools/meshdebug/CMakeLists.txt
index 18872bd7..e712b4d2 100644
--- a/tools/meshdebug/CMakeLists.txt
+++ b/tools/meshdebug/CMakeLists.txt
@@ -10,7 +10,6 @@ qt_add_tool(meshdebug
main.cpp
PUBLIC_LIBRARIES
Qt::Qml # special case
- Qt::OpenGL # special case
Qt::Gui
Qt::Quick3DAssetImportPrivate
)

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

@ -0,0 +1,116 @@
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 Normal file
View File

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

72
recipes-qt/qt6/qtquick3d/0001-Regenerate-CMakeLists.patch
View File

@ -1,72 +0,0 @@
From 9a26026d2f293af4d9cbd0b1c21aba3073319853 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 2 Jun 2020 14:51:07 +0300
Subject: [PATCH] Regenerate CMakeLists
Change-Id: I5917b2b86b23ac24a2fa99f8bf55436e7e96a0d2
---
tools/balsam/.prev_CMakeLists.txt | 3 ++-
tools/balsam/CMakeLists.txt | 3 ++-
tools/meshdebug/.prev_CMakeLists.txt | 3 ++-
tools/meshdebug/CMakeLists.txt | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/balsam/.prev_CMakeLists.txt b/tools/balsam/.prev_CMakeLists.txt
index b42e580..f2736e5 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 55a090d..c8cd1d2 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 9ca4153..34815a5 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 18872bd..a99ad77 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
--
2.25.1

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

@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
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-Regenerate-CMakeLists.patch \
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"
@ -27,7 +27,7 @@ _FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "2a05a1207c0c068c2b141387d06ce72cb7c6367b"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_qtquick3d = "beb1c0b0fa83c151b9f63de6a18229aa5d5e415e"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"

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

@ -12,8 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
do_configure_prepend() {
sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt
}
SRCREV = "0ba45442f3f1102af73ec2666e4e5c24ed516331"
SRCREV = "2ba4a895a48be6927818008580ab0a88cc8c4e12"

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

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

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

@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "5d2a472ed30592d655e55545af4a778762e93b38"
SRCREV = "44dc13f3adfb2ac7d3a32178fb496376671541fa"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "15cbfd5a0b3c729f1e5f2b456fb701c23fe3f898"
SRCREV = "035c5334a2964a63cdb873a143e6290e48d1f28c"

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

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

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

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

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

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

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

@ -0,0 +1,48 @@
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,8 +12,12 @@ 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 = "a553ba77e528d05df5012ab7cd620f861080a6b1"
SRCREV = "d7e89a71bbbb50122b8175886eed7bdf8a2f6c8d"

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

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "810bd3fabb67e4f87d1518731708bb2e08ca38d8"
SRCREV = "67eeb6b8d66c340d4ecda09ee14f281d35581e5f"

45
recipes-qt/qt6/qtvirtualkeyboard/0001-Remove-operator-for-QInputMethodEvent-Attribute.patch
View File

@ -1,45 +0,0 @@
From 5f3ceedc9c08a77aacb3c3e0b1d09afb61329be0 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Wed, 29 Jul 2020 13:41:11 +0200
Subject: [PATCH] Remove operator== for QInputMethodEvent::Attribute
This was added to qtbase in 46ec92dad0f71c8d5e3260a67321d82054ea607e.
Task-number: QTBUG-85789
Change-Id: Ide246ba7bc75d4ef51d2c1f35172b64bece332c1
---
src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 8 --------
src/virtualkeyboard/shadowinputcontext.cpp | 1 -
2 files changed, 9 deletions(-)
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 4365178..94c6283 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -44,14 +44,6 @@
QT_BEGIN_NAMESPACE
-bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2)
-{
- return attribute1.start == attribute2.start &&
- attribute1.length == attribute2.length &&
- attribute1.type == attribute2.type &&
- attribute1.value == attribute2.value;
-}
-
using namespace QtVirtualKeyboard;
const bool QtVirtualKeyboard::QT_VIRTUALKEYBOARD_FORCE_EVENTS_WITHOUT_FOCUS = qEnvironmentVariableIsSet("QT_VIRTUALKEYBOARD_FORCE_EVENTS_WITHOUT_FOCUS");
diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp
index dc49f51..75fa479 100644
--- a/src/virtualkeyboard/shadowinputcontext.cpp
+++ b/src/virtualkeyboard/shadowinputcontext.cpp
@@ -36,7 +36,6 @@
#include <QQuickItem>
QT_BEGIN_NAMESPACE
-bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2);
namespace QtVirtualKeyboard {

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

@ -8,10 +8,6 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Remove-operator-for-QInputMethodEvent-Attribute.patch \
"
# To enabled Nuance T9 Write support, you need to provide the licensed components
# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
# for example:
@ -122,4 +118,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "bbb35e000f2298ab5d3fc14d52a550ed80cd6b05"
SRCREV = "25ceb52e58d2c83b54a1c39d77f3594673099abf"

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

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

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

@ -1,835 +0,0 @@
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,9 +13,7 @@ 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 ?= "\
@ -39,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "2e329455193caf40785aa5081f50a2c4f275be88"
SRCREV = "67a6ff004798294daf6c88b4ed59e68f716e5129"

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

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