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 <martin.smith@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files 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";
     }