diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 10:46:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 10:46:00 (GMT) |
| commit | 60b09b8915e2095b221eb0a16a76d49e5bb10391 (patch) | |
| tree | 90f1564ea8f8775363e47d5f4fd911f2d28f23e1 /src/gui/image/qpixmap_raster.cpp | |
| parent | c791b300b288635ed018d50c5e6e28859b374b5e (diff) | |
| parent | f8c6df878f14e1b00a2dde03decffb6cba2f1687 (diff) | |
| download | Qt-60b09b8915e2095b221eb0a16a76d49e5bb10391.zip Qt-60b09b8915e2095b221eb0a16a76d49e5bb10391.tar.gz Qt-60b09b8915e2095b221eb0a16a76d49e5bb10391.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: (56 commits)
Give the toplevel widget a layout
fix tests when using Qt in a namespace
Fix tst_symbols auto test
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
...
Diffstat (limited to 'src/gui/image/qpixmap_raster.cpp')
0 files changed, 0 insertions, 0 deletions