summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-08-11 15:05:07 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2022-08-11 16:42:38 +0200
commit5ba16f1d2590041254e428cbf3c20226df73fc61 (patch)
treef94fd3b16814274c279bc46e89a0b8675880c808
parente52ce2c05e40791a04237300c094de2a5f7d2464 (diff)
Disable headersclean check for the ActiveQt module
We disable this headersclean check this way, since syncqt adds the header files from the subdirectories to the ActiveQt module. This triggers the headersclean rules creation and execution, but they fail because ActiveQt module doesn't link the necessary libraries so their compile flags and include directories are missing. We cannot simply link libraries because the missing include directories belong to the AxServer and AxContainer modules which have conflicting object files and cannot be linked in the same time. Change-Id: I7b8cc40dc920d1f2d436bededb76c8ff270bbc6d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/activeqt/CMakeLists.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/activeqt/CMakeLists.txt b/src/activeqt/CMakeLists.txt
index a9d4193..5787052 100644
--- a/src/activeqt/CMakeLists.txt
+++ b/src/activeqt/CMakeLists.txt
@@ -8,10 +8,21 @@ add_subdirectory(axbase)
add_subdirectory(control)
add_subdirectory(container)
+# We disable this headersclean check this way, since syncqt adds the header files from the
+# subdirectories to the ActiveQt module. This triggers the headersclean rules creation and
+# execution, but they fail because ActiveQt module doesn't link the necessary libraries so
+# their compile flags and include directories are missing.
+# We cannot simply link libraries because the missing include directories belong to the
+# AxServer and AxContainer modules which have conflicting object files and cannot be linked in the
+# same time.
+set(QT_FEATURE_headersclean_BACKUP "${QT_FEATURE_headersclean}")
+set(QT_FEATURE_headersclean OFF)
qt_internal_add_module(ActiveQt HEADER_MODULE MODULE_INCLUDE_NAME ActiveQt)
qt_internal_add_docs(ActiveQt
doc/activeqt.qdocconf
)
+set(QT_FEATURE_headersclean "${QT_FEATURE_headersclean_BACKUP}")
+
# special case end
## Scopes:
#####################################################################