summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_win.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-17 20:46:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-17 20:46:18 (GMT)
commit8e26d4b87ad5e2e61d7692af5ee5040caa6ef71a (patch)
tree68ea264ebbdc1b9f63b5c2f8d28941b82fff55ad /src/gui/image/qpixmap_win.cpp
parentcbf6c5b810316efba3ccfb27f05576b8dbfe3890 (diff)
parent9d63852e31674eb5de2da5cb57a09aff31aabb31 (diff)
downloadQt-8e26d4b87ad5e2e61d7692af5ee5040caa6ef71a.zip
Qt-8e26d4b87ad5e2e61d7692af5ee5040caa6ef71a.tar.gz
Qt-8e26d4b87ad5e2e61d7692af5ee5040caa6ef71a.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: PathView doesn't update if preferred highlight range changes. Image.PreserveAspectFit has unexpected effect on Image's sourceSize Doc improvement for Image.fillMode. QDeclarativeView flickers when composited on MeeGo Re-enable lineHeight tests. Fix for wrong dpi metrics for raster pixmaps on Symbian. Introduce QGraphicsItem::ItemStopsFocusHandling flag Qt.include() used in WorkerScript is broken on Windows.
Diffstat (limited to 'src/gui/image/qpixmap_win.cpp')
0 files changed, 0 insertions, 0 deletions