Doc: Fixed QDoc's navigation mechanism.

The HTML pages need to display minimal navigation such
as a link to the module landing page or Qt 5's index.html.

-new variables available in qdocconf files:
    navigation.landingpage
    navigation.homepage
    navigation.cppclassespage
    navigation.qmltypespage
    buildversion

The navigation variables are for the new navigation bar.
The buildversion variable is to insert documentation build
information into the pages.

Note about compatibility with Qt Creator docs:
The HTML template files for Qt Creator is retained to keep
Qt Creator compatible with 5.0.x and 5.1.x.

Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h
index cdf296e783..15e97588ee 100644
--- a/src/tools/qdoc/htmlgenerator.h
+++ b/src/tools/qdoc/htmlgenerator.h
@@ -127,7 +127,7 @@ private:
     };
 
     const QPair<QString,QString> anchorForNode(const Node *node);
-    void generateBreadCrumbs(const QString& title,
+    void generateNavigationBar(const QString& title,
                              const Node *node,
                              CodeMarker *marker);
     void generateHeader(const QString& title,
@@ -239,7 +239,7 @@ private:
     QString footer;
     QString address;
     bool pleaseGenerateMacRef;
-    bool noBreadCrumbs;
+    bool noNavigationBar;
     QString project;
     QString projectDescription;
     QString projectUrl;
@@ -252,6 +252,12 @@ private:
     QStack<QXmlStreamWriter*> xmlWriterStack;
     static int id;
     QList<ManifestMetaFilter> manifestMetaContent;
+    QString homepage;
+    QString landingpage;
+    QString cppclassespage;
+    QString qmltypespage;
+    QString buildversion;
+
 public:
     static bool debugging_on;
     static QString divNavTop;
@@ -262,9 +268,9 @@ public:
 #define HTMLGENERATOR_GENERATEMACREFS   "generatemacrefs" // ### document me
 #define HTMLGENERATOR_POSTHEADER        "postheader"
 #define HTMLGENERATOR_POSTPOSTHEADER    "postpostheader"
-#define HTMLGENERATOR_NOBREADCRUMBS     "nobreadcrumbs"
+#define HTMLGENERATOR_NONAVIGATIONBAR   "nonavigationbar"
+
 
 QT_END_NAMESPACE
 
 #endif
-