diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-29 10:14:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-29 10:14:32 (GMT) |
| commit | 56ccbf03983bc703a2220cc600f127f52ce89a53 (patch) | |
| tree | 7236fa2b6be327606e93c62c96f8ef2236444cb5 | |
| parent | 84f100353ba8352dc917baefeabb64ea7d5bcacd (diff) | |
| parent | 4bd7e6930fcd9e04696aa5426691cd90ba383a32 (diff) | |
| download | Qt-56ccbf03983bc703a2220cc600f127f52ce89a53.zip Qt-56ccbf03983bc703a2220cc600f127f52ce89a53.tar.gz Qt-56ccbf03983bc703a2220cc600f127f52ce89a53.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed a copy-paste error in QRasterPixmapData::metric().
| -rw-r--r-- | src/gui/image/qpixmap_raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 1b01e6f..3c1d7e9 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -375,7 +375,7 @@ int QRasterPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const case QPaintDevice::PdmWidthMM: return qRound(d->width * 25.4 / qt_defaultDpiX()); case QPaintDevice::PdmHeightMM: - return qRound(d->width * 25.4 / qt_defaultDpiY()); + return qRound(d->height * 25.4 / qt_defaultDpiY()); case QPaintDevice::PdmNumColors: return d->colortable.size(); case QPaintDevice::PdmDepth: |