summaryrefslogtreecommitdiffstats
path: root/doc/global
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-02-19 15:16:31 +0100
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-02-22 08:33:57 +0000
commiteec3aa499a6d8392566aeb5ab36d98c68b3400bf (patch)
tree23f824933d86ac53a433b213a8da1bf4e60fe438 /doc/global
parent8ce7441892b1e089a1836334f5f71130930d28eb (diff)
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 <martin.smith@theqtcompany.com>
Diffstat (limited to 'doc/global')
-rw-r--r--doc/global/qt-cpp-defines.qdocconf4
1 files changed, 4 insertions, 0 deletions
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\\)"