diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-08-01 19:10:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-02 20:38:54 +0200 |
| commit | 17a68ee65bf96f8a88cdf9628aaac1d5c63b8e6f (patch) | |
| tree | d6b26edfb116ab8935f1029c7ad883059995c550 /src/tools | |
| parent | 5ac4a1304b44283bb0ddf593b08e7e44ed9a107f (diff) | |
QDoc: Add extra tags when no HTML.endheader is specified.
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>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index ecd974921e..0397be06cd 100644 --- 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) |