diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-05 18:36:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-05 18:36:10 (GMT) |
| commit | dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0 (patch) | |
| tree | 21ea670935253bb7002a29bea308d0cf9fa78595 /src/gui/image/qpixmap_raster.cpp | |
| parent | 6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff) | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| download | Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.zip Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.tar.gz Qt-dbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'src/gui/image/qpixmap_raster.cpp')
| -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: |