From eaae969ac604df5aef0c36a0ddaa20209bff70db Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 13 Mar 2023 14:00:24 +0100 Subject: [PATCH] Propagate QT_DISABLE_DEPRECATED_UP_TO to QtLibraryInfo library This helps to fix the static build, which was previously failing with QT_DISABLE_DEPRECATED_UP_TO, because it was the only library that did not see the definition. Fixes: QTBUG-111884 Pick-to: 6.5 6.5.0 6.4 Change-Id: I9324019bc8cbb7ba7a87dd348ea60e25cb681005 Reviewed-by: Alexandru Croitor Reviewed-by: Marc Mutz --- qmake/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index c9014f35fd8..72618b1e29f 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -35,6 +35,8 @@ if("${hostdatadir}" STREQUAL "") set(hostdatadir ".") endif() +qt_internal_library_deprecation_level(deprecation_define) + target_compile_definitions(QtLibraryInfo PUBLIC PROEVALUATOR_FULL QT_BUILD_QMAKE @@ -44,6 +46,7 @@ target_compile_definitions(QtLibraryInfo PUBLIC QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}" QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}" QT_HOST_DATADIR="${hostdatadir}" + ${deprecation_define} ) if(NOT QT_FEATURE_qmake)