diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2023-06-08 14:51:24 +0200 |
|---|---|---|
| committer | Axel Spoerl <axel.spoerl@qt.io> | 2023-06-19 19:47:33 +0200 |
| commit | c8b3c09355d6bce0964b6e4a3c783ec73fa6628b (patch) | |
| tree | f3972fc1dad9ad227b7cd2ac6dcf6286ff29a48d /examples/demos/documentviewer/plugins/txtviewer | |
| parent | c77719ff5d44947acc85daf794bcbd3f9f8c0702 (diff) | |
Documentviewer Demo: Turn AbstractViewer class into static library
abstractviewer.cpp is compiled 3 times, once for each plugin.
That leads to duplicate symbol compiler warnings on macOS and makes
the demo unusable on macOS.
This patch turns the class in to a static library and links it into
the plugins.
Fixes: QTBUG-114370
Fixes: QTBUG-114618
Pick-to: 6.6
Change-Id: I7c785e4d463bc908c8df707f1a45301731c4da35
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/demos/documentviewer/plugins/txtviewer')
| -rw-r--r-- | examples/demos/documentviewer/plugins/txtviewer/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/demos/documentviewer/plugins/txtviewer/CMakeLists.txt b/examples/demos/documentviewer/plugins/txtviewer/CMakeLists.txt index 7e0730a1e..07272b780 100644 --- a/examples/demos/documentviewer/plugins/txtviewer/CMakeLists.txt +++ b/examples/demos/documentviewer/plugins/txtviewer/CMakeLists.txt @@ -7,7 +7,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets qt_add_plugin(txtviewer CLASS_NAME TxtViewer txtviewer.cpp txtviewer.h - ../../app/abstractviewer.h ../../app/abstractviewer.cpp ) set_target_properties(txtviewer PROPERTIES @@ -22,6 +21,7 @@ target_link_libraries(txtviewer PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets + abstractviewer ) if(TARGET Qt6::PrintSupport) |