168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into features/effectnode

This commit is contained in:
Uwe Rathmann 2023-12-17 18:13:52 +01:00
parent 7f410a0781 cbd4fa9bdc
commit d9ebaa8b03
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -120,7 +120,6 @@ list(APPEND HEADERS
nodes/QskPaintedNode.h nodes/QskPaintedNode.h
nodes/QskPlainTextRenderer.h nodes/QskPlainTextRenderer.h
nodes/QskRichTextRenderer.h nodes/QskRichTextRenderer.h
nodes/QskSceneTexture.h
nodes/QskSGNode.h nodes/QskSGNode.h
nodes/QskStrokeNode.h nodes/QskStrokeNode.h
nodes/QskStippledLineRenderer.h nodes/QskStippledLineRenderer.h
@ -158,7 +157,6 @@ list(APPEND SOURCES
nodes/QskPlainTextRenderer.cpp nodes/QskPlainTextRenderer.cpp
nodes/QskRectangleNode.cpp nodes/QskRectangleNode.cpp
nodes/QskRichTextRenderer.cpp nodes/QskRichTextRenderer.cpp
nodes/QskSceneTexture.cpp
nodes/QskSGNode.cpp nodes/QskSGNode.cpp
nodes/QskStrokeNode.cpp nodes/QskStrokeNode.cpp
nodes/QskStippledLineRenderer.cpp nodes/QskStippledLineRenderer.cpp
@ -171,6 +169,11 @@ list(APPEND SOURCES
nodes/QskVertex.cpp 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) qt_add_resources(SOURCES nodes/shaders.qrc)
list(APPEND HEADERS list(APPEND HEADERS

4
src/controls/QskQuick.cpp
View File

@ -399,9 +399,9 @@ const QSGRootNode* qskScenegraphAnchorNode( const QQuickItem* item )
const QSGRootNode* qskScenegraphAnchorNode( const QQuickWindow* window ) 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(); return renderer->rootNode();
} }

2
src/nodes/QskSceneTexture.cpp
View File

@ -6,6 +6,8 @@
#include "QskSceneTexture.h" #include "QskSceneTexture.h"
#include "QskTreeNode.h" #include "QskTreeNode.h"
#include <qmath.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>
#include <private/qsgbatchrenderer_p.h> #include <private/qsgbatchrenderer_p.h>