diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-06 17:18:18 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-09 18:47:51 +0100 |
| commit | 76230d98795a2e7a365328eb693ff57f6ddd7f1d (patch) | |
| tree | 406a34ba3194f8ed7253a8968e404439f2640c4c /cmake | |
| parent | 632da28e9ca1d67639f60e4c20ca54b38ae10dcd (diff) | |
CMake: Add handling of PLUGIN_EXTENDS for generic plugins
Modify pro2cmake converter to add extra argument to
qt_internal_add_plugin. DEFINE_IF FALSE is added to generic plugins
those had "PLUGIN_EXTENDS = - " specified in .pro files.
Fixes: QTBUG-87861
Change-Id: I9269df19a32a088f5261f50e7ffff6d29c3d605f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPluginHelpers.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index b5250a4717..ade09cb2a1 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -133,11 +133,10 @@ function(qt_internal_add_plugin target) _qt_plugin_install_package_suffix "${plugin_install_package_suffix}") endif() - # TODO: This is a bit too coarse for generic plugins. - # The generic plugins should also be enabled by default, once QTBUG-87861 is fixed. + # The generic plugins should be enabled by default. # But platform plugins should always be disabled by default, and only one is enabled # based on the platform (condition specified in arg_DEFAULT_IF). - if(plugin_type_escaped STREQUAL "generic" OR plugin_type_escaped STREQUAL "platforms") + if(plugin_type_escaped STREQUAL "platforms") set(_default_plugin 0) else() set(_default_plugin 1) |