From d15309edeed53da021d058218e4c739e5903d8fd Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 16 Jul 2014 14:35:00 +0200 Subject: qdoc: Support use of \value command outside \enum topic. Even though qdoc accepts the \value command(s) anywhere in the documentation and generates tables for them, the produced output was invalid for documentation topics other than \enum. This change fixes the issue by not trying to resolve the enumeration values and removing the 'Value' column for generated tables when the \value command is used outside c++ enum documentation topic. This enables, for example, the use of the \value command for documenting acceptable values for QML enumeration properties, without having to use custom lists or tables. Task-number: QTBUG-35019 Change-Id: I597b2f9d7d03d4ab72f276752ddf53e1c405313c Reviewed-by: Jerome Pasion Reviewed-by: Martin Smith --- src/tools/qdoc/cppcodemarker.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/tools/qdoc/cppcodemarker.cpp') diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index 60c71422290..d3cb111873a 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -403,6 +403,9 @@ QString CppCodeMarker::markedUpFullName(const Node *node, const Node *relative) QString CppCodeMarker::markedUpEnumValue(const QString &enumValue, const Node *relative) { + if (relative->type() != Node::Enum) + return enumValue; + const Node *node = relative->parent(); QString fullName; while (node->parent()) { -- cgit v1.2.3