diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-28 10:32:13 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-28 18:15:24 +0100 |
| commit | 38ee9ee8497291c899c2a72e0ed24bfffe9ced4e (patch) | |
| tree | d9495ef2c423bfb41215f36fc4e33b44cf9683fa /src/corelib/Qt6CoreConfigExtras.cmake.in | |
| parent | 8f33a0424f5799a87d6d56691f3e47a09156c720 (diff) | |
Avoid resetting CMAKE_AUTOMOC_MACRO_NAMES
Instead of overwriting the CMAKE_AUTOMOC_MACRO_NAMES, we try to append
our desired moc names to it, and don't get rid of what's there.
Thanks for Friedrich W. H. Kossebau for filling a descriptive bug report
and offering a solution as well.
Pick-to: 6.5 6.4 6.2
Fixes: QTBUG-110497
Change-Id: I582af431151cacfe24085b890ae9dba0a0e53f3f
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/corelib/Qt6CoreConfigExtras.cmake.in')
| -rw-r--r-- | src/corelib/Qt6CoreConfigExtras.cmake.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in index 16f2ea00683..4a9f72a049b 100644 --- a/src/corelib/Qt6CoreConfigExtras.cmake.in +++ b/src/corelib/Qt6CoreConfigExtras.cmake.in @@ -26,7 +26,8 @@ if (NOT QT_NO_CREATE_TARGETS) set_property(TARGET ${__qt_core_target} PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype) endif() -set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT") +list(APPEND CMAKE_AUTOMOC_MACRO_NAMES Q_OBJECT Q_GADGET Q_GADGET_EXPORT Q_NAMESPACE Q_NAMESPACE_EXPORT) +list(REMOVE_DUPLICATES CMAKE_AUTOMOC_MACRO_NAMES) include("${CMAKE_CURRENT_LIST_DIR}/QtInstallPaths.cmake") |