diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 21:18:11 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 21:18:11 +0200 |
| commit | 6750d0dcbf5a2e88fab2e127dc3e057f0d68bf71 (patch) | |
| tree | e79c09594e34f23c0769948bd53d1e0b72563921 /src/gui/text/qstatictext.cpp | |
| parent | afef0789d8dd3ac2611f0c136e026d7d9cfa68f6 (diff) | |
| parent | 1537036175c0cfedf013e5b47a801a4dc6983a00 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Doc: Fixed an off-by-one error in an example.
Fix QT_NO_TEXTHTMLPARSER
Fix QT_NO_DOM
Fix QT_NO_TEXTSTREAM compilation errors.
Fix QT_NO_VALIDATOR compilation.
Doc: Removed a misleading sentence about a class constructor.
Doc: correcting docs in QDrag::exec
Doc: Adding note about QDrag::exec()
Revert behavior of QTextLayout::boundingRect() when line width is set
Fix unreasonably large width of QTextLayout::boundingRect()
Doc: replacing old image
Fix compilation with stricts compilers.
Fix QT_NO_DIRMODEL build error in QtDeclarative.
Revert "Added native key support to QSharedMemory API."
Revert "Improved documentation for QSharedMemory's key/setKey functions."
Fix a simple mistake in QXmlStreamReader::atEnd() docs.
Improved documentation for QSharedMemory's key/setKey functions.
Added native key support to QSharedMemory API.
Make test work with shadow builds again.
Doc: Corrected the documentation about the compression threshold.
...
Diffstat (limited to 'src/gui/text/qstatictext.cpp')
0 files changed, 0 insertions, 0 deletions