aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Winkelmann <michael.winkelmann@qt.io>2019-10-09 12:31:55 +0200
committerMichael Winkelmann <michael.winkelmann@qt.io>2019-10-31 15:44:46 +0000
commit9985d623a4c53f82c0eb1f1ca3430a836f8cffa4 (patch)
tree6bb2bf310e0fe330e3c624bb2d3b6f3822bf8a06
parente2f82cd57f676cb8e5cf970a403c67588fc2cb89 (diff)
PluginManager is not moc'ed automaticallyv4.11.0-beta2
This leads to a linker error in ExtensionManager because symbols generated by moc are missing. This caused by an issue with CMake 4.10 / AutoMoc and Q_OBJECT in a documentation comment. Instead, headers of PluginManager are moc'ed explicitly. Change-Id: I2dd655c48d0bf90e178e46655eaa0f2dc1ed8b0a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/extensionsystem/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/extensionsystem/CMakeLists.txt b/src/libs/extensionsystem/CMakeLists.txt
index 53f928153c..fd3345ff78 100644
--- a/src/libs/extensionsystem/CMakeLists.txt
+++ b/src/libs/extensionsystem/CMakeLists.txt
@@ -12,5 +12,7 @@ add_qtc_library(ExtensionSystem
pluginmanager.cpp pluginmanager.h pluginmanager_p.h
pluginspec.cpp pluginspec.h pluginspec_p.h
pluginview.cpp pluginview.h
- SKIP_AUTOMOC pluginmanager.cpp
+ EXPLICIT_MOC
+ pluginmanager.h
+ pluginmanager_p.h
)