diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 05:55:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 05:55:55 (GMT) |
| commit | 773512d205df2ba7caa28b7b5cdbfbd6787a0967 (patch) | |
| tree | b43ac88fa0adc5655f05d665cdd9b95794cbdb00 /tools/qdoc3/test/qt-html-templates.qdocconf | |
| parent | c68fc875a4f824686b1a55f5eb810ad72922e58a (diff) | |
| parent | f77cd44a51c36e661c28e5b65ca4e17445bdffa5 (diff) | |
| download | Qt-773512d205df2ba7caa28b7b5cdbfbd6787a0967.zip Qt-773512d205df2ba7caa28b7b5cdbfbd6787a0967.tar.gz Qt-773512d205df2ba7caa28b7b5cdbfbd6787a0967.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:
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
QXmlStreamReader: avoid unnecessary detaching
QSslCertificate: support expiration dates > 2049
Doc: Fixing typo
Doc: Fixing bug involving header misplacement in Creator style
qdoc: Added list of all members (including inherited) page to QML elements.
qdoc: Ensured that text is encoded correctly.
qdoc: Fixed non-well-formed markup.
Doc: Fixed typo in a shortcut string.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Doc: Added more license information.
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 70f3a40..71b13ff 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -166,4 +166,5 @@ HTML.footer = " <!-- /div -->\n" \ " </form>\n" \ " </div>\n" \ " <div id=\"blurpage\">\n" \ - " </div>\n" + " </div>\n" \ + " </div>\n" |