From cbd4fa9bdc326c8692f8f51d1663b19cadacf843 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Sun, 17 Dec 2023 18:12:57 +0100 Subject: [PATCH] QskSceneTexture disabled for Qt5 ( not done yet ) --- src/CMakeLists.txt | 7 +++++-- src/controls/QskQuick.cpp | 4 ++-- src/nodes/QskSceneTexture.cpp | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 313e1b93..e017237a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -120,7 +120,6 @@ list(APPEND HEADERS nodes/QskPaintedNode.h nodes/QskPlainTextRenderer.h nodes/QskRichTextRenderer.h - nodes/QskSceneTexture.h nodes/QskSGNode.h nodes/QskStrokeNode.h nodes/QskStippledLineRenderer.h @@ -158,7 +157,6 @@ list(APPEND SOURCES nodes/QskPlainTextRenderer.cpp nodes/QskRectangleNode.cpp nodes/QskRichTextRenderer.cpp - nodes/QskSceneTexture.cpp nodes/QskSGNode.cpp nodes/QskStrokeNode.cpp nodes/QskStippledLineRenderer.cpp @@ -171,6 +169,11 @@ list(APPEND SOURCES nodes/QskVertex.cpp ) +if (QT_VERSION_MAJOR VERSION_GREATER 5) + list(APPEND HEADERS nodes/QskSceneTexture.h) + list(APPEND SOURCES nodes/QskSceneTexture.cpp) +endif() + qt_add_resources(SOURCES nodes/shaders.qrc) list(APPEND HEADERS diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp index c2888db9..7760e916 100644 --- a/src/controls/QskQuick.cpp +++ b/src/controls/QskQuick.cpp @@ -399,9 +399,9 @@ const QSGRootNode* qskScenegraphAnchorNode( const QQuickItem* item ) const QSGRootNode* qskScenegraphAnchorNode( const QQuickWindow* window ) { - if ( window ) + if ( auto w = const_cast< QQuickWindow* >( window ) ) { - if ( auto renderer = QQuickWindowPrivate::get( window )->renderer ) + if ( auto renderer = QQuickWindowPrivate::get( w )->renderer ) return renderer->rootNode(); } diff --git a/src/nodes/QskSceneTexture.cpp b/src/nodes/QskSceneTexture.cpp index 582488b6..8660fdcb 100644 --- a/src/nodes/QskSceneTexture.cpp +++ b/src/nodes/QskSceneTexture.cpp @@ -6,6 +6,8 @@ #include "QskSceneTexture.h" #include "QskTreeNode.h" +#include + QSK_QT_PRIVATE_BEGIN #include #include