diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2023-03-13 14:00:24 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2023-03-13 22:12:38 +0100 |
| commit | eaae969ac604df5aef0c36a0ddaa20209bff70db (patch) | |
| tree | 1c84d0ffc1995a2753d235c33f5b8aadad445c78 | |
| parent | f314e821c11e13151d8e8e02878c29ac4d486606 (diff) | |
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 <alexandru.croitor@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | qmake/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index c9014f35fd..72618b1e29 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) |