Merge branch 'master' into features/effectnode

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

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();
     }
 

src/nodes/QskSceneTexture.cpp

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