diff options
Diffstat (limited to 'examples')
5 files changed, 9 insertions, 7 deletions
diff --git a/examples/widgets/tools/CMakeLists.txt b/examples/widgets/tools/CMakeLists.txt index 3346cafe09..80c8f43007 100644 --- a/examples/widgets/tools/CMakeLists.txt +++ b/examples/widgets/tools/CMakeLists.txt @@ -15,7 +15,5 @@ add_subdirectory(undoframework) if(QT_FEATURE_library) # special case add_subdirectory(echoplugin) - # FIXME: Currently broken # special case - # Fails to link (ld: error: undefined symbol: qt_static_plugin_BasicToolsPlugin()) # special case - #add_subdirectory(plugandpaint) # special case + add_subdirectory(plugandpaint) # special case endif() diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt index fefa30e2a4..76474c282b 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt @@ -15,7 +15,8 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) -add_library(pnp_basictools MODULE +qt6_add_plugin(pnp_basictools STATIC) +target_sources(pnp_basictools PRIVATE basictoolsplugin.cpp basictoolsplugin.h ) target_include_directories(pnp_basictools PUBLIC diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt index fefa30e2a4..b0a752718f 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt @@ -15,7 +15,8 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) -add_library(pnp_basictools MODULE +qt_add_plugin(pnp_basictools STATIC) +target_sources(pnp_basictools PRIVATE basictoolsplugin.cpp basictoolsplugin.h ) target_include_directories(pnp_basictools PUBLIC diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt index 2f689893bb..57f37843b8 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt @@ -15,7 +15,8 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) -add_library(pnp_extrafilters MODULE +qt_add_plugin(pnp_extrafilters) +target_sources(pnp_extrafilters PRIVATE extrafiltersplugin.cpp extrafiltersplugin.h ) target_include_directories(pnp_extrafilters PUBLIC diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt index 2f689893bb..57f37843b8 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt @@ -15,7 +15,8 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) -add_library(pnp_extrafilters MODULE +qt_add_plugin(pnp_extrafilters) +target_sources(pnp_extrafilters PRIVATE extrafiltersplugin.cpp extrafiltersplugin.h ) target_include_directories(pnp_extrafilters PUBLIC |