From 2c666f61266b0098024ff3d6a52006481931eb81 Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Thu, 29 Sep 2022 00:21:22 +0200 Subject: [PATCH] dialogbuttons compilable --- CMakeLists.txt | 3 +-- playground/CMakeLists.txt | 27 ++++++++++++------------- playground/dialogbuttons/CMakeLists.txt | 18 ++++++++++++++--- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd39f6b4..dff2fedb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,7 @@ add_subdirectory(qmlexport) add_subdirectory(tools) add_subdirectory(support) add_subdirectory(examples) -#TODO -#add_subdirectory(playground) +add_subdirectory(playground) #TODO #OTHER_FILES = diff --git a/playground/CMakeLists.txt b/playground/CMakeLists.txt index 71b0dc26..f954281e 100644 --- a/playground/CMakeLists.txt +++ b/playground/CMakeLists.txt @@ -1,16 +1,15 @@ -TEMPLATE = subdirs +#add_subdirectory(anchors) +#add_subdirectory(dials) +add_subdirectory(dialogbuttons) +#add_subdirectory(invoker) +#add_subdirectory(inputpanel) +#add_subdirectory(images) +#add_subdirectory(shadows) - SUBDIRS += anchors dials dialogbuttons invoker inputpanel images +if(TARGET Qt5::WebEngine) # TODO check how to add optionally + #add_subdirectory(webview) +endif() - SUBDIRS += - shadows - - qtHaveModule(webengine){ - - SUBDIRS += webview - } - -qtHaveModule(quickwidgets) -{ - SUBDIRS += grids -} +if(TARGET Qt5::QuickWidgets) # TODO check how to add optionally + #add_subdirectory(grids) +endif() diff --git a/playground/dialogbuttons/CMakeLists.txt b/playground/dialogbuttons/CMakeLists.txt index 7b96337a..8df071bc 100644 --- a/playground/dialogbuttons/CMakeLists.txt +++ b/playground/dialogbuttons/CMakeLists.txt @@ -1,8 +1,20 @@ -CONFIG += qskexample +set(TARGET_NAME qskexample) list(APPEND TARGET_HEADERS - Window.h + Window.h) list(APPEND TARGET_SOURCES Window.cpp - main.cpp + main.cpp) + +add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER examples) \ No newline at end of file