From eec3aa499a6d8392566aeb5ab36d98c68b3400bf Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 19 Feb 2016 15:16:31 +0100 Subject: Doc: Evaluate QT_VERSION >= QT_VERSION_CHECK(6,0,0) to false This check is used in many places in the public header files, and correctly documenting the affected declarations depend on QDoc evaluating it correctly. As QDoc currently cannot evaluate complex preprocessor directives, work around this by explicitly evaluating the version check to false. Change-Id: If22eff76f6831c92375d9a0b25d04aa46422da13 Task-number: QTBUG-51262 Reviewed-by: Martin Smith --- doc/global/qt-cpp-defines.qdocconf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 967bbb8ede..54d2cbbe4e 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -161,3 +161,7 @@ Cpp.ignoredirectives += \ QT_WARNING_DISABLE_MSVC \ Q_ATTRIBUTE_FORMAT_PRINTF \ Q_MV_IOS + +# Qt 6: Remove +falsehoods += \ + "QT_VERSION >= QT_VERSION_CHECK\\(6,0,0\\)" -- cgit v1.2.3