From ae70011377900d0d459a6f5cecb3d8d9608f7113 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Tue, 6 Apr 2021 16:01:51 +0200
Subject: [PATCH] Remove use of qt_internal_module_info from
 qt_internal_add_plugin

Plugin targets don't fit the requirements of the module but use
the function associated to the module. The purpose of using
qt_internal_module_info is to get the path to the top-level include
directory. So there is no point in breaking the encapsulation rules
to get a well-known directory.

Change-Id: If3d2a31d4ec186929e3d662a79a1ae9eac988d1a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtPluginHelpers.cmake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
index 86d59cb8ab9..0787e31e06f 100644
--- a/cmake/QtPluginHelpers.cmake
+++ b/cmake/QtPluginHelpers.cmake
@@ -23,8 +23,6 @@ endmacro()
 # A CMake target is created with the given target. The TYPE parameter is needed to place the
 # plugin into the correct plugins/ sub-directory.
 function(qt_internal_add_plugin target)
-    qt_internal_module_info(module "${target}")
-
     qt_internal_set_qt_known_plugins("${QT_KNOWN_PLUGINS}" "${target}")
 
     _qt_internal_get_add_plugin_keywords(
@@ -230,7 +228,7 @@ function(qt_internal_add_plugin target)
         "${CMAKE_CURRENT_SOURCE_DIR}"
         "${CMAKE_CURRENT_BINARY_DIR}"
          # For the syncqt headers
-        "$<BUILD_INTERFACE:${module_repo_include_dir}>"
+        "$<BUILD_INTERFACE:${QT_BUILD_DIR}/include>"
          ${arg_INCLUDE_DIRECTORIES}
     )