summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-04-30 10:11:40 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-05-01 19:11:57 +0200
commitb530ddf79536b376a8a8171b5aaa7df669de9e5e (patch)
tree86c4237b7c78fdc63f8433b92fd3afb2b6cf62bc /cmake
parent29bb6311e3149444322065371627d1052fbfeee4 (diff)
CMake: Write QT.XXX.plugin_types to qt_lib_XXX.pri files
This is needed for building Qt plugins with qmake against other CMake-built modules. Change-Id: Ibd6ad0b08645c798be74285b24f71add947bea88 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuild.cmake8
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index cfd52dd8bb..7ed47fc4f2 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -607,6 +607,13 @@ function(qt_generate_module_pri_file target target_path config_module_name pri_f
endif()
if (NOT ${arg_INTERNAL_MODULE})
+ if(arg_HEADER_MODULE)
+ set(module_plugin_types "")
+ else()
+ get_target_property(module_plugin_types ${target} MODULE_PLUGIN_TYPES)
+ list(JOIN module_plugin_types " " module_plugin_types)
+ endif()
+
qt_path_join(pri_file_name "${target_path}" "qt_lib_${config_module_name}.pri")
list(APPEND pri_files "${pri_file_name}")
@@ -620,6 +627,7 @@ QT.${config_module_name}.libs = $$QT_MODULE_LIB_BASE
QT.${config_module_name}.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}
QT.${config_module_name}.frameworks =
QT.${config_module_name}.bins = $$QT_MODULE_BIN_BASE
+QT.${config_module_name}.plugin_types = ${module_plugin_types}
QT.${config_module_name}.depends =
QT.${config_module_name}.uses =
QT.${config_module_name}.module_config = ${joined_module_internal_config}