diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 12:12:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 12:12:10 (GMT) |
| commit | bd593fa64efebbe6608631ec9c08290414389c16 (patch) | |
| tree | 5fdad4f2827d6025ba4c3e8eba78a8438f90b1e4 /tools/qdoc3/htmlgenerator.h | |
| parent | 4676dd62871da2b58452ebda477a04c25158bec4 (diff) | |
| parent | 7a51c6023ffd2a6e222b842a34d62b7f3ce8db4b (diff) | |
| download | Qt-bd593fa64efebbe6608631ec9c08290414389c16.zip Qt-bd593fa64efebbe6608631ec9c08290414389c16.tar.gz Qt-bd593fa64efebbe6608631ec9c08290414389c16.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Added online flag to the qdocconf file.
I10n: Update German translations for 4.7.0
Fix compile warning.
Report the error as being AlreadyExists if this is why it fails
move network scan to thread.
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 559c968..2a365e9 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -297,6 +297,7 @@ class HtmlGenerator : public PageGenerator bool inTableHeader; int numTableRows; bool threeColumnEnumValueTable; + bool offlineDocs; QString link; QStringList sectionNumber; QRegExp funcLeftParen; |