From b1ccf65102550bfd9eabd0311a2af4e1abedfcce Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 18 Feb 2015 14:03:11 +0100 Subject: qdoc: Let qdoc ignore Q_ENUM and Q_FLAG Q_ENUM and Q_FLAG were not listed in the Cpp.ignoredirectives variable in qt-cpp-defines.qdocconf. This never used to cause parsing errors in qdoc, but now it does. The cause for this change was not determined at the time of this fix, which is to add Q_ENUM and Q_FLAG to the ignore directives list. Change-Id: I717c9101f7706097869f23b53eeca8cb1a0fee0a Task-number: QTBUG-44510 Reviewed-by: Olivier Goffart (Woboq GmbH) --- doc/global/qt-cpp-defines.qdocconf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 0d9dfd8716..3491e00402 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -140,7 +140,9 @@ Cpp.ignoredirectives += \ QT_DEPRECATED_X \ Q_DISABLE_COPY \ Q_DUMMY_COMPARISON_OPERATOR \ + Q_ENUM \ Q_ENUMS \ + Q_FLAG \ Q_FLAGS \ Q_INTERFACES \ Q_PRIVATE_PROPERTY \ -- cgit v1.2.3