From a5b78a3660d9b92d12c950eddb4cb3ccc43893b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Fri, 5 Jul 2019 11:55:05 +0200 Subject: [PATCH] cmake: implement default qpa plugin behavior for static builds This is done by adding a DEFAULT_IF argument to add_qt_plugin, which accepts if-evaluated expressions. e.g. add_qt_plugin(myplugin DEFAULT_IF ${foo} STREQUAL ${bar} ... ) so that this mechanism can be reused later if necessary. Change-Id: I7eba9adaaa28e55a4f0f94cf206e868b990027e6 Reviewed-by: Alexandru Croitor --- cmake/QtBuild.cmake | 12 ++++++++++-- cmake/QtPlugins.cmake.in | 16 ++++++++-------- cmake/QtProperties.cmake | 12 ++++++++++++ src/plugins/platforms/android/CMakeLists.txt | 1 + src/plugins/platforms/cocoa/CMakeLists.txt | 1 + src/plugins/platforms/eglfs/CMakeLists.txt | 1 + src/plugins/platforms/linuxfb/CMakeLists.txt | 1 + src/plugins/platforms/minimal/CMakeLists.txt | 1 + src/plugins/platforms/minimalegl/CMakeLists.txt | 1 + src/plugins/platforms/offscreen/CMakeLists.txt | 1 + src/plugins/platforms/vnc/CMakeLists.txt | 1 + src/plugins/platforms/windows/CMakeLists.txt | 1 + src/plugins/platforms/xcb/CMakeLists.txt | 1 + 13 files changed, 40 insertions(+), 10 deletions(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index b2c25b5ef68..df9e9008ce0 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1449,7 +1449,7 @@ function(add_qt_plugin target) qt_parse_all_arguments(arg "add_qt_plugin" "STATIC;EXCEPTIONS" "TYPE;CLASS_NAME;OUTPUT_DIRECTORY;INSTALL_DIRECTORY;ARCHIVE_INSTALL_DIRECTORY" - "${__default_private_args};${__default_public_args}" ${ARGN}) + "${__default_private_args};${__default_public_args};DEFAULT_IF" ${ARGN}) set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}") @@ -1501,7 +1501,15 @@ function(add_qt_plugin target) set_property(TARGET "${qt_module}" APPEND PROPERTY QT_PLUGINS "${target}") endif() - set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES "QT_PLUGIN_CLASS_NAME;QT_MODULE") + set(_default_plugin 1) + if (DEFINED arg_DEFAULT_IF) + if (NOT ${arg_DEFAULT_IF}) + set(_default_plugin 0) + endif() + endif() + + set_property(TARGET "${target}" PROPERTY QT_DEFAULT_PLUGIN "${_default_plugin}") + set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES "QT_PLUGIN_CLASS_NAME;QT_MODULE;QT_DEFAULT_PLUGIN") extend_target("${target}" SOURCES ${arg_SOURCES} diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in index b51c7cec29e..e6547508a7e 100644 --- a/cmake/QtPlugins.cmake.in +++ b/cmake/QtPlugins.cmake.in @@ -3,7 +3,7 @@ if(NOT @BUILD_SHARED_LIBS@) set(_module_target "@INSTALL_CMAKE_NAMESPACE@::@QT_MODULE@") - set(_default_plugins_genex "$>") + set(_default_plugins_are_enabled "$>") set(_manual_plugins_genex "$>") set(_no_plugins_genex "$>") @@ -15,17 +15,17 @@ if(NOT @BUILD_SHARED_LIBS@) continue() endif() - set(_user_specified_genex "$") + set(_plugin_is_default "$") + set(_plugin_is_not_blacklisted "$>") + set(_plugin_is_whitelisted "$") string(CONCAT _plugin_condition "$>" + "${_default_plugins_are_enabled}," + "${_plugin_is_default}," + "${_plugin_is_not_blacklisted}" ">" ">>" ) diff --git a/cmake/QtProperties.cmake b/cmake/QtProperties.cmake index e8b1fbf4f08..0c3507b9538 100644 --- a/cmake/QtProperties.cmake +++ b/cmake/QtProperties.cmake @@ -38,6 +38,18 @@ define_property(TARGET For instance, Sql for qsqlite" ) +define_property(TARGET + PROPERTY + QT_DEFAULT_PLUGIN + BRIEF_DOCS + "Indicates whether a plug-in is added by default." + FULL_DOCS + "This is a property on Qt plug-ins. + It is mainly used to indicate if a plug-in should be added + to the default set of plug-ins when building a static app - + for instance, which QPA should be linked." +) + define_property(GLOBAL PROPERTY QT_KNOWN_PLUGINS diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 5b91a733f1e..f0da443481d 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qtforandroid TYPE platforms + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case SOURCES androidcontentfileengine.cpp androidcontentfileengine.h androiddeadlockprotector.cpp androiddeadlockprotector.h diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 61b7c367af0..9b546990bad 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -9,6 +9,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) add_qt_plugin(qcocoa TYPE platforms + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case CLASS_NAME QCocoaIntegrationPlugin SOURCES main.mm diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index d7ca11acb67..6705e40e0d1 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -80,6 +80,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl add_qt_plugin(qeglfs TYPE platforms CLASS_NAME QEglFSIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case SOURCES qeglfsmain.cpp DEFINES diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index 623a5296c99..463c66989fa 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -7,6 +7,7 @@ add_qt_plugin(qlinuxfb TYPE platforms CLASS_NAME QLinuxFbIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case SOURCES main.cpp qlinuxfbintegration.cpp qlinuxfbintegration.h diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 7f5ff13b275..6a2bda464de 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -7,6 +7,7 @@ add_qt_plugin(qminimal TYPE platforms CLASS_NAME QMinimalIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case SOURCES main.cpp qminimalbackingstore.cpp qminimalbackingstore.h diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 8118bef4c5a..a37b4f9a253 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -7,6 +7,7 @@ add_qt_plugin(qminimalegl TYPE platforms CLASS_NAME QMinimalEglIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case SOURCES main.cpp qminimaleglintegration.cpp qminimaleglintegration.h diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index a81b3b434f7..98fa9164456 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -7,6 +7,7 @@ add_qt_plugin(qoffscreen TYPE platforms CLASS_NAME QOffscreenIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case SOURCES main.cpp qoffscreencommon.cpp qoffscreencommon.h diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index 8a294a09fb2..cdb2be39d83 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -7,6 +7,7 @@ add_qt_plugin(qvnc TYPE platforms CLASS_NAME QVncIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case SOURCES main.cpp qvnc.cpp qvnc_p.h diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 44a16989947..f4989649e2e 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -7,6 +7,7 @@ add_qt_plugin(qwindows TYPE platforms CLASS_NAME QWindowsIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case SOURCES main.cpp qtwindowsglobal.h diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 6849c75e2e9..92c0a842adb 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -190,6 +190,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_p add_qt_plugin(qxcb TYPE platforms CLASS_NAME QXcbIntegrationPlugin + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case SOURCES qxcbmain.cpp DEFINES