From f8409dcc68f1df4f05e2a051e7019d523402c0a7 Mon Sep 17 00:00:00 2001 From: Orkun Tokdemir Date: Tue, 6 Aug 2024 12:19:18 +0200 Subject: [PATCH] Doc: Improve AUTOGEN_BETTER_GRAPH_MULTI_CONFIG documentation Pick-to: 6.8 Task-number: QTBUG-126461 Change-Id: I9d7fa477b7889dfef009bbf8e09b281212b70ea9 Reviewed-by: Alexandru Croitor --- src/corelib/doc/snippets/cmake-macros/examples.cmake | 8 ++++++++ src/corelib/doc/src/cmake/cmake-standard-properties.qdoc | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/src/corelib/doc/snippets/cmake-macros/examples.cmake b/src/corelib/doc/snippets/cmake-macros/examples.cmake index b85ea07e7f0..835d45bc089 100644 --- a/src/corelib/doc/snippets/cmake-macros/examples.cmake +++ b/src/corelib/doc/snippets/cmake-macros/examples.cmake @@ -104,3 +104,11 @@ add_subdirectory(mylib) qt_finalize_project() #! [qt_finalize_project_manual] + +#! [AUTOGEN_BETTER_GRAPH_MULTI_CONFIG_1] +set(CMAKE_AUTOGEN_BETTER_GRAPH_MULTI_CONFIG ON) +#! [AUTOGEN_BETTER_GRAPH_MULTI_CONFIG_1] + +#! [AUTOGEN_BETTER_GRAPH_MULTI_CONFIG_2] +set_target_properties(app PROPERTIES AUTOGEN_BETTER_GRAPH_MULTI_CONFIG ON) +#! [AUTOGEN_BETTER_GRAPH_MULTI_CONFIG_2] diff --git a/src/corelib/doc/src/cmake/cmake-standard-properties.qdoc b/src/corelib/doc/src/cmake/cmake-standard-properties.qdoc index a8ece6ba8f3..0a342edf50b 100644 --- a/src/corelib/doc/src/cmake/cmake-standard-properties.qdoc +++ b/src/corelib/doc/src/cmake/cmake-standard-properties.qdoc @@ -20,5 +20,10 @@ However, \l{qt_extract_metatypes} and \l{qt_add_qml_module} were updated to support \c{AUTOGEN_BETTER_GRAPH_MULTI_CONFIG} in Qt 6.8, so you will get build errors, unless you patch the older Qt version to support it. +To set this property globally, use the following command: +\snippet cmake-macros/examples.cmake AUTOGEN_BETTER_GRAPH_MULTI_CONFIG_1 +or set it on a target: +\snippet cmake-macros/examples.cmake AUTOGEN_BETTER_GRAPH_MULTI_CONFIG_2 + See \l{https://cmake.org/cmake/help/latest/prop_tgt/AUTOGEN_BETTER_GRAPH_MULTI_CONFIG.html}{AUTOGEN_BETTER_GRAPH_MULTI_CONFIG} for more information. */