From ded46dc7a8d42c351f1a822c16b1eb507533b871 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 21 Jun 2018 14:52:51 +0200 Subject: qdoc: Remove 'QML' specifier from generated type strings \since command for QML properties generates a string 'This QML property was introduced in Qt x.y' This commit drops the use of QML from above sentence. There's little need to repeat the string 'QML' as it appears on QML reference page already - by keeping the type strings simple, the generated sentences make more sense also when commands like \qmlproperty are used in documenting a non-QML interface, as is the case with Qbs. Task-number: QBS-1294 Change-Id: I9c8488331b3fb279f80aeb390b00e48b12d79e19 Reviewed-by: Martin Smith Reviewed-by: Christian Kandeler --- src/qdoc/generator.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 1e28ce5ef..b877ddeb0 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -2280,21 +2280,19 @@ QString Generator::typeString(const Node *node) case Node::Function: return "function"; case Node::Property: + case Node::QmlProperty: return "property"; case Node::QmlPropertyGroup: return "property group"; - case Node::QmlProperty: - return "QML property"; case Node::QmlSignal: - return "QML signal"; + return "signal"; case Node::QmlSignalHandler: - return "QML signal handler"; + return "signal handler"; case Node::QmlMethod: - return "QML method"; + return "method"; case Node::Module: - return "module"; case Node::QmlModule: - return "QML module"; + return "module"; default: return "documentation"; } -- cgit v1.2.1