projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5ac4a13)
QDoc: Add extra tags when no HTML.endheader is specified.
authorCasper van Donderen <casper.vandonderen@nokia.com>
Wed, 1 Aug 2012 17:10:47 +0000 (19:10 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 2 Aug 2012 18:38:54 +0000 (20:38 +0200)
The default Qt template inserts </head><body> with some arguments in the header of the HTML document.
When you don't specify the HTML.endheader qdocconf variable those tags will not be generated and the
QTextBrowser-based view in Qt Assistant will not be able to render the documentation.

Change-Id: Ieee231f300e1dc71d6b6343771d2682b3de96d73
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
src/tools/qdoc/htmlgenerator.cpp patch | blob | history

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index ecd9749..0397be0 100644 (file)
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1846,7 +1846,10 @@ void HtmlGenerator::generateHeader(const QString& title,
     // Include style sheet and script links.
     out() << headerStyles;
     out() << headerScripts;
-    out() << endHeader;
+    if (endHeader.isEmpty())
+        out() << "</head>\n<body>\n";
+    else
+        out() << endHeader;
 
 #ifdef GENERATE_MAC_REFS
     if (mainPage)
Domain: UI Framework / Uncategorized;