1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Remove QT_NO_SHOW_OLD_QT_WRAP_CPP_WARNING

Browse Source 
Fixes: QTBUG-128145
Change-Id: Iffa1e6ba05d6cca1323e01861d8028c06b34a656
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f60237ac93859be11415aa28c097137da23aea60)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Orkun Tokdemir 2024-08-20 16:46:52 +02:00 committed by Qt Cherry-pick Bot
parent b48b0dba63
commit d92264a089
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/Qt6CoreMacros.cmake
View File

@ -180,13 +180,6 @@ function(qt6_wrap_cpp)
if(TARGET ${ARGV0}) if(TARGET ${ARGV0})
_qt_internal_wrap_cpp(dummy TARGET ${ARGV}) _qt_internal_wrap_cpp(dummy TARGET ${ARGV})
else() else()
if(NOT QT_NO_SHOW_OLD_QT_WRAP_CPP_WARNING)
message(WARNING "You are using the output-variable signature of "
"qt6_wrap_cpp(), which is deprecated. Instead, use "
"the newer signature that takes the target as the "
"first argument. To silence this warning pass "
"-DQT_NO_SHOW_OLD_QT_WRAP_CPP_WARNING=ON")
endif()
set(output_parameter ${ARGV0}) set(output_parameter ${ARGV0})
_qt_internal_wrap_cpp(${ARGV}) _qt_internal_wrap_cpp(${ARGV})
set(${output_parameter} "${${output_parameter}}" PARENT_SCOPE) set(${output_parameter} "${${output_parameter}}" PARENT_SCOPE)

3
src/corelib/doc/src/cmake/qt_wrap_cpp.qdoc
View File

@ -25,8 +25,7 @@ qt_wrap_cpp(<TARGET> src_file1 [src_file2 ...]
[DEPENDS ...]) [DEPENDS ...])
\endcode \endcode
\note The signature above is recommended over the older signature, which is \note The signature above is recommended over the older signature.
deprecated since Qt 6.8.
\badcode \badcode
qt_wrap_cpp(<VAR> src_file1 [src_file2 ...] qt_wrap_cpp(<VAR> src_file1 [src_file2 ...]