From 85970834b5be1dda971996a34a1b1f14a4c71fa8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 14 Feb 2022 15:58:49 +0100 Subject: [PATCH] CMake: Promote qt6_standard_project_setup from technical preview The API couldn't be simpler (function without arguments), and we want to use the function on our "Getting Started with CMake" documentation page. Pick-to: 6.3 Task-number: QTBUG-100793 Change-Id: I83ba66c2970ac7441b425add4df1da2695e50ddb Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 2 -- src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc | 1 - 2 files changed, 3 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 6c809e10819..436bda645d0 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2498,8 +2498,6 @@ endfunction() # Note this needs to be a macro because it sets variables intended for the # calling scope. -# This function is currently in Technical Preview. -# Its signature and behavior might change. macro(qt6_standard_project_setup) # A parent project might want to prevent child projects pulled in with # add_subdirectory() from changing the parent's preferred arrangement. diff --git a/src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc b/src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc index f86c0546d2b..b74c4f8fb70 100644 --- a/src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc +++ b/src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc @@ -37,7 +37,6 @@ \include cmake-find-package-core.qdocinc \cmakecommandsince 6.3 -\preliminarycmakecommand \section1 Synopsis