diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-10-24 18:56:30 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-02 09:41:50 +0100 |
| commit | 7f473c56fe32cf7b4f96572315c088a972c622a0 (patch) | |
| tree | 422ab951a1d7d7fee4eba4d07309af8536dc8e0b /src | |
| parent | 776fc97c79401c15616b73a78b21b1bb4c95b7c7 (diff) | |
Disable the headersclean check for the ActiveQt module explicitly
Use the new NO_HEADERSCLEAN_CHECK option instead of disabling the
corresponding feature.
Amends 5ba16f1d2590041254e428cbf3c20226df73fc61
Change-Id: Ieed063eb5178f6875a1e0afb71c18f36e7870261
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/CMakeLists.txt | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/activeqt/CMakeLists.txt b/src/activeqt/CMakeLists.txt index 116efd6..991a071 100644 --- a/src/activeqt/CMakeLists.txt +++ b/src/activeqt/CMakeLists.txt @@ -8,18 +8,15 @@ 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) +# We disable the headersclean check, since these header files don't belong to the ActiveQt module. +# Headersclean rules 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 meaning and cannot be linked in the same time. qt_internal_add_module(ActiveQt HEADER_MODULE MODULE_INCLUDE_NAME ActiveQt + NO_HEADERSCLEAN_CHECK SOURCES axbase/qaxtypefunctions_p.h axbase/qaxutils_p.h @@ -38,7 +35,6 @@ qt_internal_add_module(ActiveQt qt_internal_add_docs(ActiveQt doc/activeqt.qdocconf ) -set(QT_FEATURE_headersclean "${QT_FEATURE_headersclean_BACKUP}") # special case end ## Scopes: |