summaryrefslogtreecommitdiffstats
path: root/examples/layouts
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-22 09:58:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-22 09:58:08 (GMT)
commit98824c2ebe97f61bf294b0be07ac164aed470fbf (patch)
tree0621c3002e2f2fe28fc6e39a14429928cc2aa072 /examples/layouts
parenta3c2f84f1a33610b86a600c68653b96de1d2b9f5 (diff)
parente5be06e53a33605a4f5987e9d451b2143470bdf4 (diff)
downloadQt-98824c2ebe97f61bf294b0be07ac164aed470fbf.zip
Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.tar.gz
Qt-98824c2ebe97f61bf294b0be07ac164aed470fbf.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/layouts')
0 files changed, 0 insertions, 0 deletions