diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 22:02:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 22:02:59 (GMT) |
| commit | e5be06e53a33605a4f5987e9d451b2143470bdf4 (patch) | |
| tree | fa5b65b5b79b113a9c3acb28b7e688dac11208e4 /examples/uitools | |
| parent | be6a0b58680213da42d956ed9d1c77103be24c93 (diff) | |
| parent | 91340390f4968241a804c259c4a468f0a526436d (diff) | |
| download | Qt-e5be06e53a33605a4f5987e9d451b2143470bdf4.zip Qt-e5be06e53a33605a4f5987e9d451b2143470bdf4.tar.gz Qt-e5be06e53a33605a4f5987e9d451b2143470bdf4.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:
Fall back to Qt for loading images with DICAPS_COLORKEY.
Implement QWidget::metric PdmNumColors for QWS
Adding ::scroll capabilities to live pixmaps.
Major refactoring: creating a new QPixmapData subclass for live textures.
Diffstat (limited to 'examples/uitools')
0 files changed, 0 insertions, 0 deletions