diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 13:04:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 13:04:05 (GMT) |
| commit | e82b5535c170c82d3ba7369eb1957f8d264300e2 (patch) | |
| tree | 957159b580b5155b3f6518beedf83333480d80ec /src/gui/widgets | |
| parent | 8ae4ad3ac2f47a76be6d0f14f4466070ffcb07a9 (diff) | |
| parent | da005580969b2501a246027f47f75ed3ee52670e (diff) | |
| download | Qt-e82b5535c170c82d3ba7369eb1957f8d264300e2.zip Qt-e82b5535c170c82d3ba7369eb1957f8d264300e2.tar.gz Qt-e82b5535c170c82d3ba7369eb1957f8d264300e2.tar.bz2 | |
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:
Fixes a regression preventing loading images without extensions
Made GL pixmap backend respect Qt::NoOpaqueDetection flag..
QTextCodec: fix wodring of a comment
QDeclarativeImageProvider: Do not keep the global declarative mutex locked when processing.
Diffstat (limited to 'src/gui/widgets')
0 files changed, 0 insertions, 0 deletions