From 76230d98795a2e7a365328eb693ff57f6ddd7f1d Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 6 Nov 2020 17:18:18 +0100 Subject: 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 --- src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt | 1 + src/plugins/platformthemes/gtk3/CMakeLists.txt | 1 + src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) (limited to 'src/plugins/platformthemes') diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt index 764675101c..cc77607ab2 100644 --- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_plugin(QGtk3ThemePlugin OUTPUT_NAME qgtk3 TYPE platformthemes + DEFAULT_IF FALSE SOURCES main.cpp qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index 042282faf6..f83f48e13e 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -10,6 +10,7 @@ qt_find_package(X11) # special case qt_internal_add_plugin(QGtk3ThemePlugin OUTPUT_NAME qgtk3 TYPE platformthemes + DEFAULT_IF FALSE SOURCES main.cpp qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index 2466253af9..caaf0de7b2 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_plugin(QXdgDesktopPortalThemePlugin OUTPUT_NAME qxdgdesktopportal TYPE platformthemes + DEFAULT_IF FALSE SOURCES main.cpp qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h -- cgit v1.2.3