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

Propagate QT_DISABLE_DEPRECATED_UP_TO to QtLibraryInfo library

Browse Source 
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 <alexandru.croitor@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Ivan Solovev 2023-03-13 14:00:24 +01:00
parent f314e821c1
commit eaae969ac6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/CMakeLists.txt
View File

@ -35,6 +35,8 @@ if("${hostdatadir}" STREQUAL "")
set(hostdatadir ".") set(hostdatadir ".")
endif() endif()
qt_internal_library_deprecation_level(deprecation_define)
target_compile_definitions(QtLibraryInfo PUBLIC target_compile_definitions(QtLibraryInfo PUBLIC
PROEVALUATOR_FULL PROEVALUATOR_FULL
QT_BUILD_QMAKE QT_BUILD_QMAKE
@ -44,6 +46,7 @@ target_compile_definitions(QtLibraryInfo PUBLIC
QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}" QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}"
QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}" QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}"
QT_HOST_DATADIR="${hostdatadir}" QT_HOST_DATADIR="${hostdatadir}"
${deprecation_define}
) )
if(NOT QT_FEATURE_qmake) if(NOT QT_FEATURE_qmake)