diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2023-03-13 14:00:24 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-03-14 16:40:17 +0000 |
| commit | 96da9eeb7a5ca5f99a17d12b41877ad5b5ef3acd (patch) | |
| tree | 3055577d1d955c3c68699fc93585ec8fceb963dd | |
| parent | 511254bca93226095663da991192046c9a347bd7 (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
Change-Id: I9324019bc8cbb7ba7a87dd348ea60e25cb681005
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit eaae969ac604df5aef0c36a0ddaa20209bff70db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 30e00991b1..e347accba3 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -29,6 +29,8 @@ if("${hostdatadir}" STREQUAL "") set(hostdatadir ".") endif() +qt_internal_library_deprecation_level(deprecation_define) + target_compile_definitions(QtLibraryInfo PUBLIC PROEVALUATOR_FULL QT_BUILD_QMAKE @@ -37,6 +39,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) |