diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 02:03:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 02:03:07 (GMT) |
| commit | 179cc58660d4ba274ac95e39ed3cfb2845054121 (patch) | |
| tree | e5b5b8a795cb7d2bcd5273d02b7ab2d65175348f /tools/qdoc3/test/assistant.qdocconf | |
| parent | 0fd09af3a05ac88c55fed73c85dc1c5aba68f057 (diff) | |
| parent | 673d3af547ada38a489b06b21d11e77a9bb1d4a3 (diff) | |
| download | Qt-179cc58660d4ba274ac95e39ed3cfb2845054121.zip Qt-179cc58660d4ba274ac95e39ed3cfb2845054121.tar.gz Qt-179cc58660d4ba274ac95e39ed3cfb2845054121.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:
Some optimizations for QImage::load()
fix setRawData()
Fix QML crashes on the N900
doc: Added DITA XML generator
Fix build failure on Symbian 3.1.
Add the Qt::TextBypassShaping flag.
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Add my 4.7.0 changes
qdoc: Added DITA XML generator
doc: Fixed confusing ownership issue.
update Russian translations for Qt tools
update Russian translation for Qt libraries
QXmlSchema documentation correction
doc: Changed last breadcrumb to not be a link.
doc: Fixed reference to setSize(), which is in QRectF.
QNetworkCookie: do not accept cookies with non-alNum domain
QtDeclarative: Remove trailing commas in enums
Doc: MonotonicClock is obviously monotonic
Diffstat (limited to 'tools/qdoc3/test/assistant.qdocconf')
0 files changed, 0 insertions, 0 deletions