diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 22:52:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 22:52:50 (GMT) |
| commit | 7f6deb2d42933f59adbebc95b872e670978de3e6 (patch) | |
| tree | 329bc78a9766c296186605fab85acecb16293dbe /tools | |
| parent | 84c519862aa3a089471af6fd2174b16a88c10844 (diff) | |
| parent | 58bac5551cbeed83a99e257226bb7b40d363bab9 (diff) | |
| download | Qt-7f6deb2d42933f59adbebc95b872e670978de3e6.zip Qt-7f6deb2d42933f59adbebc95b872e670978de3e6.tar.gz Qt-7f6deb2d42933f59adbebc95b872e670978de3e6.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (72 commits)
Fix opening a network session multiple times in succession.
Fix synchronous dispatch in ICD in non-main threads.
Russian translation update
QNAM HTTP: Download last chunk properly when readBufferSize() limited
Remove code changes that were NOT intended as part of the fix
Prevent access to non-existent memory in QGL2PEXVertexArray
Wordwrap QInputDialog label in Symbian
Prevent excessive seeks in xbm detection
Use qtmain.lib to provide entry point for all Symbian applications
Give the toplevel widget a layout
Doc: Correcting character escape bug
fix tests when using Qt in a namespace
Fix tst_symbols auto test
Doc: Clarified the lifetime of the session bus connection.
Doc: Added a snippet showing the default BorderImage tiling behavior.
Doc: using pointer member variables and language change
Doc: Added more instructions to help with device file permissions.
Doc: Mentioned default values for the BorderImage tile modes.
Document the difference between +0.0 and -0.0 for QPointF and QSizeF.
trivial: fix build
...
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 4d22964..4ae032f 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -9,7 +9,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <div id=\"nav-logo\">\n" \ " <a href=\"index.html\">Home</a></div>\n" \ " <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \ - " <div id="narrowsearch"></div>\n" \ + " <div id=\"narrowsearch\"></div>\n" \ " <div id=\"nav-topright\">\n" \ " <ul>\n" \ " <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \ |