Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: Ibd5f6052bd07152fbe344505308563d9857771e9

1 files changed, 13 insertions, 2 deletions

diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index b0e4e823d..0f413c7f5 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -179,8 +179,14 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
         if (style == Summary || style == Accessors) {
             if (func->virtualness() != FunctionNode::NonVirtual)
                 synopsis.prepend("virtual ");
+            if (func->isFinal())
+                synopsis.append(" final");
             if (func->virtualness() == FunctionNode::PureVirtual)
                 synopsis.append(" = 0");
+            else if (func->isDeleted())
+                synopsis.append(" = delete");
+            else if (func->isDefaulted())
+               synopsis.append(" = default");
         }
         else if (style == Subpage) {
             if (!func->returnType().isEmpty() && func->returnType() != "void")
@@ -190,8 +196,13 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
             QStringList bracketed;
             if (func->isStatic()) {
                 bracketed += "static";
-            }
-            else if (func->virtualness() != FunctionNode::NonVirtual) {
+            } else if (func->isDeleted()) {
+                bracketed += "delete";
+            } else if (func->isDefaulted()) {
+                bracketed += "default";
+            } else if (func->virtualness() != FunctionNode::NonVirtual) {
+                if (func->isFinal())
+                    bracketed += "final";
                 if (func->virtualness() == FunctionNode::PureVirtual)
                     bracketed += "pure";
                 bracketed += "virtual";