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

CMake: propagate deprecations definitions to tools and apps

Browse Source 
If Qt itself is built without the deprecated APIs, so should be the
tools and apps.

This patch makes sure that the specified QT_DISABLE_DEPRECATED_UP_TO
and QT_WARN_DEPRECATED_UP_TO values are correctly used in the internal
tools and apps.

Fixes: QTBUG-105102
Change-Id: I7a51bddbd839c7b71efa0bff8ec959df64c53b82
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Ivan Solovev 2022-08-26 17:28:30 +02:00
parent d1175e20cf
commit b83fc9f41a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtAppHelpers.cmake
View File

@ -35,6 +35,8 @@ function(qt_internal_add_app target)
"a future Qt version. Use the LIBRARIES option instead.")
endif()
qt_internal_library_deprecation_level(deprecation_define)
qt_internal_add_executable("${target}"
QT_APP
DELAY_RC
@ -48,6 +50,7 @@ function(qt_internal_add_app target)
${arg_INCLUDE_DIRECTORIES}
DEFINES
${arg_DEFINES}
${deprecation_define}
LIBRARIES
${arg_LIBRARIES}
${arg_PUBLIC_LIBRARIES}

3
cmake/QtToolHelpers.cmake
View File

@ -217,6 +217,8 @@ function(qt_internal_add_tool target_name)
"removed in a future Qt version. Use the LIBRARIES option instead.")
endif()
qt_internal_library_deprecation_level(deprecation_define)
qt_internal_add_executable("${target_name}"
OUTPUT_DIRECTORY "${output_dir}"
${exceptions}
@ -227,6 +229,7 @@ function(qt_internal_add_tool target_name)
DEFINES
QT_USE_QSTRINGBUILDER
${arg_DEFINES}
${deprecation_define}
${corelib}
LIBRARIES
${arg_LIBRARIES}