diff options
| author | Kevin Wright <kevin.wright@nokia.com> | 2010-07-26 16:44:10 (GMT) |
|---|---|---|
| committer | Kevin Wright <kevin.wright@nokia.com> | 2010-07-26 16:44:10 (GMT) |
| commit | 64087b078f3767a2190f2b4a0d4aca2a6165ebda (patch) | |
| tree | d72bb90cd7e7eab227520de1be47c46eaf91f6c7 /tools/qdoc3/htmlgenerator.h | |
| parent | 48656520b76abe76c114fce4b466360e7e2f628f (diff) | |
| download | Qt-64087b078f3767a2190f2b4a0d4aca2a6165ebda.zip Qt-64087b078f3767a2190f2b4a0d4aca2a6165ebda.tar.gz Qt-64087b078f3767a2190f2b4a0d4aca2a6165ebda.tar.bz2 | |
Fixed the following sub-tasks for QTBUG-12192
* Qt Simulator link missing
* Integration and add-ins (on the front page, link leads to an alternative start page)
* Qt Creator (on the front page link leads to Manual version 1.3)
* Getting Started (on the front page) link broken
* More... (in Global Declarations) link broken
Additionally:
There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly.
I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index aaf2318..d92c349 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -294,6 +294,7 @@ class HtmlGenerator : public PageGenerator bool inTableHeader; int numTableRows; bool threeColumnEnumValueTable; + bool onlineDocs; bool offlineDocs; bool creatorDocs; QString link; @@ -302,6 +303,8 @@ class HtmlGenerator : public PageGenerator QString style; QString postHeader; QString postPostHeader; + QString creatorPostHeader; + QString creatorPostPostHeader; QString footer; QString address; bool pleaseGenerateMacRef; @@ -339,6 +342,8 @@ class HtmlGenerator : public PageGenerator #define HTMLGENERATOR_GENERATEMACREFS "generatemacrefs" // ### document me #define HTMLGENERATOR_POSTHEADER "postheader" #define HTMLGENERATOR_POSTPOSTHEADER "postpostheader" +#define HTMLGENERATOR_CREATORPOSTHEADER "postheader" +#define HTMLGENERATOR_CREATORPOSTPOSTHEADER "postpostheader" #define HTMLGENERATOR_STYLE "style" #define HTMLGENERATOR_STYLESHEETS "stylesheets" #define HTMLGENERATOR_CUSTOMHEADELEMENTS "customheadelements" |