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

cmake files fixed for using the QuickShapes module

Browse Source
This commit is contained in:
Uwe Rathmann 2024-09-13 10:27:13 +02:00
parent 3fb9ac8495
commit 7b153058f0
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/QskFindMacros.cmake
View File

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

11
playground/gradients/CMakeLists.txt
View File

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

1
playground/gradients/GradientQuickShape.cpp
View File

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