From 9ec8d463aad27371e7e6e4d5642d5559d31278f4 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 30 Jul 2021 15:21:50 +0200 Subject: [PATCH] Adjust INTERFACE_MODULE_HAS_HEADERS property name After introducing the _qt_module_has_headers target property, it's better to replace the INTERFACE_MODULE_HAS_HEADERS use by _qt_module_has_headers since properties duplicate each other. Pick-to: 6.2 Change-Id: Ia1b35cc21bf31fce593c374d196aa450e6fd7e08 Reviewed-by: Alexandru Croitor --- src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake | 2 +- src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake index 6bda08e70fc..879841a075a 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake @@ -39,7 +39,7 @@ function(qt6_generate_wayland_protocol_client_sources target) set(wayland_include_dir "${arg_WAYLAND_INCLUDE_DIR}") else() get_target_property(qt_module ${target} _qt_module_interface_name) - get_target_property(is_for_module "${target}" INTERFACE_MODULE_HAS_HEADERS) + get_target_property(is_for_module "${target}" _qt_module_has_headers) if (qt_module) set(wayland_include_dir "Qt${qt_module}/private") elseif (is_for_module) diff --git a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake index 3fb08b3a743..a9e79ce45c2 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake @@ -37,7 +37,7 @@ function(qt6_generate_wayland_protocol_server_sources target) set(wayland_include_dir "${arg_WAYLAND_INCLUDE_DIR}") else() get_target_property(qt_module ${target} _qt_module_interface_name) - get_target_property(is_for_module "${target}" INTERFACE_MODULE_HAS_HEADERS) + get_target_property(is_for_module "${target}" _qt_module_has_headers) if (qt_module) set(wayland_include_dir "Qt${qt_module}/private") elseif (is_for_module)