From 851c69bea80064a376135de2b65e60a75c90b280 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 9 Jul 2024 13:52:12 +0200 Subject: [PATCH] CMake: Adapt deprecation macros Qt 6.8 has apparently changed from a *BEFORE to an *UP_TO naming scheme in 816071d44012. As we need also pre-6.8 builds we better have both. After talking the change's author it seems to be ok to use the same numbers. Change-Id: I451dc9ac9c842405f5f36a04079b4284a42a2378 Reviewed-by: Alexey Edelev Reviewed-by: Eike Ziller --- cmake/QtCreatorAPIInternal.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake index 49761d03ab9..9fc986205df 100644 --- a/cmake/QtCreatorAPIInternal.cmake +++ b/cmake/QtCreatorAPIInternal.cmake @@ -23,7 +23,9 @@ list(APPEND DEFAULT_DEFINES QT_NO_JAVA_STYLE_ITERATORS QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH QT_DISABLE_DEPRECATED_BEFORE=0x050900 + QT_DISABLE_DEPRECATED_UP_TO=0x050900 QT_WARN_DEPRECATED_BEFORE=0x060400 + QT_WARN_DEPRECATED_UP_TO=0x060400 QT_USE_QSTRINGBUILDER )