From 7015eafa5cc18c720d48467797bc9b55530e7181 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 26 Jan 2022 10:20:27 +0100 Subject: [PATCH] qt6_standard_project_setup: Don't enable AUTORCC We discourage using AUTORCC, so don't make it the default for our "standard project setup". Pick-to: 6.3 Task-number: QTBUG-87643 Task-number: QTBUG-100209 Change-Id: I2715ec561266bfed5ea4ac7722ab1f1c8b982788 Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 2 +- src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 6140d12a9e1..588b6cc0ec7 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2521,7 +2521,7 @@ macro(qt6_standard_project_setup) # Turn these on by default, unless they are already set. Projects can # always turn off any they really don't want after we return. - foreach(auto_set IN ITEMS MOC UIC RCC) + foreach(auto_set IN ITEMS MOC UIC) if(NOT DEFINED CMAKE_AUTO${auto_set}) set(CMAKE_AUTO${auto_set} TRUE) endif() 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 da53bb4cef4..389146a7901 100644 --- a/src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc +++ b/src/corelib/doc/src/cmake/qt_standard_project_setup.qdoc @@ -54,8 +54,8 @@ call, normally in the top level \c{CMakeLists.txt} file and before any targets have been defined. It does the following things: \list -\li The standard CMake variables \c{CMAKE_AUTOMOC}, \c{CMAKE_AUTOUIC} and - \c{CMAKE_AUTORCC} are set to true if they are not already defined. +\li The standard CMake variables \c{CMAKE_AUTOMOC} and \c{CMAKE_AUTOUIC} + are set to true if they are not already defined. This enables all Qt-related autogen features by default for subsequently created targets in the current directory scope and below. \li CMake's \l{GNUInstallDirs} module is automatically included. This defines