diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-28 17:32:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-28 17:32:23 (GMT) |
| commit | 84f100353ba8352dc917baefeabb64ea7d5bcacd (patch) | |
| tree | 3e54d2930012b07609ca453cd32d51bd53b3093e /LGPL_EXCEPTION.txt | |
| parent | 48d2b516c6713160c29850a0a253ee295620d681 (diff) | |
| parent | 8c306f8ee137baebc312a126c4e0d27bb9150f69 (diff) | |
| download | Qt-84f100353ba8352dc917baefeabb64ea7d5bcacd.zip Qt-84f100353ba8352dc917baefeabb64ea7d5bcacd.tar.gz Qt-84f100353ba8352dc917baefeabb64ea7d5bcacd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QUrl::toEncoded() fix for the case of "password, but no username".
Fix tst_QFileInfo::isHidden_data on Windows
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Lots of mostly cosmetic cleanups to GL2 paint engine
Move the 0.5 offset we add for aliased rendering to updateMatrix()
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
Read QWS_SIZE from layer rather than screen
Get rid of no_cast_from_ascii warning
Docs: Amendments to latest changes to QImageReader docs.
images: Document QImageReader::loopCount behaviour for infinite loops
gif: Add unit test for QImageReader::size calls
gif: 10% speedup on microbenchmark on QImageReader
png: Avoid calling QImage::scanLine(int) from within a loop
QImageReader: Avoid errorString creation in the normal case
Fix text rendering on GL2 paint engine
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions