diff options
Diffstat (limited to 'examples/widgets/tools/plugandpaint')
5 files changed, 16 insertions, 24 deletions
diff --git a/examples/widgets/tools/plugandpaint/CMakeLists.txt b/examples/widgets/tools/plugandpaint/CMakeLists.txt index 1d4d412adf..e681812dad 100644 --- a/examples/widgets/tools/plugandpaint/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from plugandpaint.pro. -# special case skip regeneration cmake_minimum_required(VERSION 3.16) project(plugandpaint LANGUAGES CXX) diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index 14cdaeb822..e3709ee0d3 100644 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt @@ -1,6 +1,3 @@ -# Generated from app.pro. -# special case skip regeneration - qt_add_executable(plugandpaint interfaces.h main.cpp @@ -12,13 +9,18 @@ set_target_properties(plugandpaint PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(plugandpaint PUBLIC +target_link_libraries(plugandpaint PRIVATE Qt::Widgets pnp_basictools ) +if(NOT QT6_IS_SHARED_LIBS_BUILD) + target_link_libraries(plugandpaint PRIVATE + pnp_extrafilters + ) +endif() + install(TARGETS plugandpaint RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt index 1e63da97ca..9a2d66d99e 100644 --- a/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt @@ -1,4 +1,2 @@ -# Generated from plugins.pro. - add_subdirectory(basictools) add_subdirectory(extrafilters) diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt index c66f83ce62..0056205319 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt @@ -1,19 +1,15 @@ -# Generated from basictools.pro. -# special case skip regeneration - -qt_add_plugin(pnp_basictools STATIC) +qt_add_plugin(pnp_basictools + STATIC + CLASS_NAME BasicToolsPlugin +) target_sources(pnp_basictools PRIVATE basictoolsplugin.cpp basictoolsplugin.h ) -set_target_properties(pnp_basictools PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) target_include_directories(pnp_basictools PUBLIC ../../app ) -target_link_libraries(pnp_basictools PUBLIC +target_link_libraries(pnp_basictools PRIVATE Qt::Core Qt::Gui Qt::Widgets diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt index 9227dd0537..2332f84399 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt @@ -1,19 +1,17 @@ -# Generated from extrafilters.pro. -# special case skip regeneration - -qt_add_plugin(pnp_extrafilters) +qt_add_plugin(pnp_extrafilters + CLASS_NAME ExtraFiltersPlugin +) target_sources(pnp_extrafilters PRIVATE extrafiltersplugin.cpp extrafiltersplugin.h ) set_target_properties(pnp_extrafilters PROPERTIES - MACOSX_BUNDLE TRUE LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/app" ) target_include_directories(pnp_extrafilters PUBLIC ../../app ) -target_link_libraries(pnp_extrafilters PUBLIC +target_link_libraries(pnp_extrafilters PRIVATE Qt::Core Qt::Gui Qt::Widgets |