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

Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc

1 files changed, 5 insertions, 5 deletions

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 775fc6a750..99e59f60a3 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1354,7 +1354,6 @@ void HtmlGenerator::generateCollisionPages()
 
         beginSubPage(ncn, Generator::fileName(ncn));
         QString fullTitle = ncn->fullTitle();
-        QString htmlTitle = fullTitle;
         CodeMarker* marker = CodeMarker::markerForFileName(ncn->location().filePath());
         if (ncn->isQmlNode()) {
             // Replace the marker with a QML code marker.
@@ -1362,7 +1361,7 @@ void HtmlGenerator::generateCollisionPages()
                 marker = CodeMarker::markerForLanguage(QLatin1String("QML"));
         }
 
-        generateHeader(htmlTitle, ncn, marker);
+        generateHeader(fullTitle, ncn, marker);
         if (!fullTitle.isEmpty())
             out() << "<h1 class=\"title\">" << protectEnc(fullTitle) << "</h1>\n";
 
@@ -1447,17 +1446,18 @@ void HtmlGenerator::generateDocNode(DocNode* dn, CodeMarker* marker)
     QList<Section> sections;
     QList<Section>::const_iterator s;
     QString fullTitle = dn->fullTitle();
-    QString htmlTitle = fullTitle;
 
     if (dn->subType() == Node::QmlBasicType) {
         fullTitle = "QML Basic Type: " + fullTitle;
-        htmlTitle = fullTitle;
 
         // Replace the marker with a QML code marker.
         marker = CodeMarker::markerForLanguage(QLatin1String("QML"));
     }
+    else if (dn->subType() == Node::QmlClass) {
+        fullTitle = fullTitle + " QML Type";
+    }
 
-    generateHeader(htmlTitle, dn, marker);
+    generateHeader(fullTitle, dn, marker);
     /*
       Generate the TOC for the new doc format.
       Don't generate a TOC for the home page.