summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_raster.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-04 02:45:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-04 02:45:25 (GMT)
commit4fc2d7f1b14c26d10968c99dd296e056a2beed4d (patch)
tree482a55a791f01c51347d164e7d98c584d5e87c00 /src/gui/image/qpixmap_raster.cpp
parentab672d88f906b0d6f2d45f9ebbfbf12fdcfba51e (diff)
parentb3ffd9aa12faeca6f35118182231a145f69f4ac7 (diff)
downloadQt-4fc2d7f1b14c26d10968c99dd296e056a2beed4d.zip
Qt-4fc2d7f1b14c26d10968c99dd296e056a2beed4d.tar.gz
Qt-4fc2d7f1b14c26d10968c99dd296e056a2beed4d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits) trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set ...
Diffstat (limited to 'src/gui/image/qpixmap_raster.cpp')
0 files changed, 0 insertions, 0 deletions