From b3b4ca6aefa013c6d60ba6603964eb90d3401b18 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 28 Dec 2023 17:18:34 +0100 Subject: [PATCH 1/2] Qt6 incompatibility fixed --- src/nodes/QskSceneTexture.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nodes/QskSceneTexture.cpp b/src/nodes/QskSceneTexture.cpp index 4ec93575..0274391a 100644 --- a/src/nodes/QskSceneTexture.cpp +++ b/src/nodes/QskSceneTexture.cpp @@ -210,7 +210,12 @@ namespace QSize Renderer::textureSize() const { - return m_fbo ? m_fbo->size() : QSize(); +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + if ( m_fbo ) return m_fbo->size(); +#else + if( m_rt.rt ) return m_rt.rt->pixelSize(); +#endif + return QSize(); } void Renderer::render() From faf2ecd3c8fafea7ac627d88421d87a69666fd32 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 28 Dec 2023 17:26:24 +0100 Subject: [PATCH 2/2] docs updated --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fe3abc94..070079fe 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,12 @@ But so far only Linux is actively tested. It might support all versions Qt >= 5.15, but you can rely on: - Qt 5.15 -- current long term supported ( LTS ) version of Qt +- current long term supported ( LTS ) version of Qt ( at the moment Qt 6.5.x ) - current version of Qt -On debian bullseye these packages need to be installed: `build-essential -qt-qmake qtbase5-dev qtbase5-private-dev qtdeclarative5-dev -qtdeclarative5-private-dev libqt5svg5-dev`. +On debian bullseye these packages need to be installed for Qt5: `build-essential +qtbase5-dev qtbase5-private-dev qtdeclarative5-dev qtdeclarative5-private-dev libqt5svg5-dev`. +For Qt6 you need the corresponding ones. > Optional: When enabling the `hunspell` feature the following package needs to be installed: `libhunspell-dev`