feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Adapt deprecation macros

Browse Source 
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 <alexey.edelev@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-09 13:52:12 +02:00
parent 56e239988d
commit 851c69bea8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtCreatorAPIInternal.cmake
View File

@@ -23,7 +23,9 @@ list(APPEND DEFAULT_DEFINES
QT_NO_JAVA_STYLE_ITERATORS QT_NO_JAVA_STYLE_ITERATORS
QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH
QT_DISABLE_DEPRECATED_BEFORE=0x050900 QT_DISABLE_DEPRECATED_BEFORE=0x050900
QT_DISABLE_DEPRECATED_UP_TO=0x050900
QT_WARN_DEPRECATED_BEFORE=0x060400 QT_WARN_DEPRECATED_BEFORE=0x060400
QT_WARN_DEPRECATED_UP_TO=0x060400
QT_USE_QSTRINGBUILDER QT_USE_QSTRINGBUILDER
) )