Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5

1 files changed, 3 insertions, 2 deletions

diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h
index f2efab78a1..cdf296e783 100644
--- a/src/tools/qdoc/htmlgenerator.h
+++ b/src/tools/qdoc/htmlgenerator.h
@@ -150,13 +150,14 @@ private:
                                         CodeMarker *marker);
     QString generateAllQmlMembersFile(const QmlClassNode* qml_cn,
                                       CodeMarker* marker);
-    QString generateLowStatusMemberFile(const InnerNode *inner,
+    QString generateLowStatusMemberFile(InnerNode *inner,
                                         CodeMarker *marker,
                                         CodeMarker::Status status);
     void generateClassHierarchy(const Node *relative, NodeMap &classMap);
     void generateAnnotatedList(const Node* relative, CodeMarker* marker, const NodeMap& nodeMap);
     void generateAnnotatedList(const Node* relative, CodeMarker* marker, const NodeList& nodes);
-    void generateCompactList(const Node *relative,
+    void generateCompactList(ListType listType,
+                             const Node *relative,
                              const NodeMap &classMap,
                              bool includeAlphabet,
                              QString commonPrefix = QString());