summaryrefslogtreecommitdiff
path: root/src/qdoc/cppcodemarker.cpp
diff options
context:
space:
mode:
authorRainer Keller <Rainer.Keller@qt.io>2017-01-11 13:39:15 +0100
committerRainer Keller <Rainer.Keller@qt.io>2017-01-12 11:23:29 +0000
commitb7ccfd3c107e2edc3823cd79cf67d8e4e34f668b (patch)
treefbc725d6f97b3498fad5e4f6e1051f25a32aca69 /src/qdoc/cppcodemarker.cpp
parent980fbea7adb3d31b8017f844bc8856612d3f7cff (diff)
downloadqttools-b7ccfd3c107e2edc3823cd79cf67d8e4e34f668b.tar.gz
qdoc: Implement C++11 'override' specifier support
Change-Id: Iad837dbdaf492eff77ced4d93dc05095e1d89400 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Michael Winkelmann <Michael.winkelmann@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
-rw-r--r--src/qdoc/cppcodemarker.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index bdc369612..8eac38629 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -178,6 +178,8 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
synopsis.prepend("virtual ");
if (func->isFinal())
synopsis.append(" final");
+ if (func->isOverride())
+ synopsis.append(" override");
if (func->isPureVirtual())
synopsis.append(" = 0");
else if (func->isDeleted())
@@ -200,6 +202,8 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
} else if (!func->isNonvirtual()) {
if (func->isFinal())
bracketed += "final";
+ if (func->isOverride())
+ bracketed += "override";
if (func->isPureVirtual())
bracketed += "pure";
bracketed += "virtual";