cmake files fixed for using the QuickShapes module

cmake/QskFindMacros.cmake

@@ -54,16 +54,29 @@ macro(qsk_setup_Qt)
         # C++, but QSkinny itself does not need the WebEngine at all.
 
         if (QT_VERSION_MAJOR VERSION_LESS 6)
-            find_package(Qt${QT_VERSION_MAJOR} QUIET OPTIONAL_COMPONENTS WebEngine)
+            find_package(Qt${QT_VERSION_MAJOR} QUIET
+                OPTIONAL_COMPONENTS WebEngine)
+
+            find_package(Qt${QT_VERSION_MAJOR} QUIET
+                OPTIONAL_COMPONENTS QuickShapes)
+
             set( Qt5WebEngineQuick_FOUND ${Qt5WebEngine_FOUND} )
+            set( Qt5QuickShapesPrivate_FOUND ${Qt5QuickShapes_FOUND} )
         else()
             find_package(Qt${QT_VERSION_MAJOR} QUIET
                 OPTIONAL_COMPONENTS WebEngineCore WebEngineQuick)
+
+            find_package(Qt${QT_VERSION_MAJOR} QUIET
+                OPTIONAL_COMPONENTS QuickShapesPrivate)
         endif()
 
         if( NOT Qt${QT_VERSION_MAJOR}WebEngineQuick_FOUND)
             message(STATUS "No Qt/Quick WebEngine support: skipping some unimportant examples")
         endif()
+
+        if (NOT Qt${QT_VERSION_MAJOR}QuickShapesPrivate_FOUND)
+            message(STATUS "No Qt/Quick Shapes support: skipping some unimportant examples")
+        endif()
     endif()
 endmacro()
 

playground/gradients/CMakeLists.txt

@@ -5,13 +5,14 @@
 
 set(SOURCES GradientView.h GradientView.cpp main.cpp)
 
-if(TARGET quickshapes_private)
+if(TARGET Qt::QuickShapesPrivate)
     list(APPEND SOURCES GradientQuickShape.h GradientQuickShape.cpp)
 endif()
 
-qsk_add_example(gradients ${SOURCES})
+set(target gradients)
+qsk_add_example(${target} ${SOURCES})
 
-if(TARGET quickshapes_private)
-    target_compile_definitions(gradients PRIVATE SHAPE_GRADIENT)
-    target_link_libraries(gradients PRIVATE quickshapes_private)
+if(TARGET Qt::QuickShapesPrivate)
+    target_compile_definitions(${target} PRIVATE SHAPE_GRADIENT)
+    target_link_libraries(${target} PRIVATE Qt::QuickShapesPrivate )
 endif()

playground/gradients/GradientQuickShape.cpp

@@ -14,7 +14,6 @@ QSK_QT_PRIVATE_BEGIN
     #define signals Q_SIGNALS
 #endif
 
-#include <private/qquickitem_p.h>
 #include <private/qquickshape_p.h>
 #include <private/qquickshape_p_p.h>