From b781915c393e0abc456eedf90adf5b630693eab6 Mon Sep 17 00:00:00 2001 From: Ivan Tkachenko Date: Thu, 25 Nov 2021 22:12:40 +0300 Subject: [PATCH] Drop Qt4 support Last pieces of code guarded by these defined were cleaned up back in 2016. Task-number: QTBUG-98650 Change-Id: I52d971c2b476b7d8d362be7807b71b71e657c70b Reviewed-by: Edward Welbourne --- doc/global/qt-cpp-defines.qdocconf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 94c483e9f6..c2a6ed5448 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -7,7 +7,6 @@ defines += Q_QDOC \ QT_COMPAT \ QT_KEYPAD_NAVIGATION \ QT_NO_EGL \ - Q_DEAD_CODE_FROM_QT4_.* \ Q_BYTE_ORDER \ QT_DEPRECATED \ QT_DEPRECATED_* \ @@ -54,10 +53,7 @@ clangdefines += Q_QDOC \ Q_COMPILER_VARIADIC_TEMPLATES \ Q_ATOMIC_INT16_IS_SUPPORTED \ Q_ATOMIC_INT64_IS_SUPPORTED \ - Q_ATOMIC_INT8_IS_SUPPORTED \ - Q_DEAD_CODE_FROM_QT4_MAC \ - Q_DEAD_CODE_FROM_QT4_WIN \ - Q_DEAD_CODE_FROM_QT4_X11 + Q_ATOMIC_INT8_IS_SUPPORTED # Q_COMPILER_REF_QUALIFIERS is not yet supported by all compilers