diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 06:15:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 06:15:43 (GMT) |
| commit | 6875a078a2d51648d4a60d136c4c3081f9934bb6 (patch) | |
| tree | 312ee4589aa2ab08a3457e8adbf983c77dd960bc /src/gui | |
| parent | 2034996740c51d1231dbfa7af7eb9271541682bb (diff) | |
| parent | ea66ff84b5eac1846afcaf80b3d24297be0dce8f (diff) | |
| download | Qt-6875a078a2d51648d4a60d136c4c3081f9934bb6.zip Qt-6875a078a2d51648d4a60d136c4c3081f9934bb6.tar.gz Qt-6875a078a2d51648d4a60d136c4c3081f9934bb6.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 558d574..dc236e4 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4937,10 +4937,12 @@ int QImage::dotsPerMeterY() const meter, to \a x. Together with dotsPerMeterY(), this number defines the intended - scale and aspect ratio of the image. + scale and aspect ratio of the image, and determines the scale + at which QPainter will draw graphics on the image. It does not + change the scale or aspect ratio of the image when it is rendered + on other paint devices. - \sa dotsPerMeterX(), {QImage#Image Information}{Image - Information} + \sa dotsPerMeterX(), {QImage#Image Information}{Image Information} */ void QImage::setDotsPerMeterX(int x) { @@ -4957,10 +4959,12 @@ void QImage::setDotsPerMeterX(int x) to \a y. Together with dotsPerMeterX(), this number defines the intended - scale and aspect ratio of the image. + scale and aspect ratio of the image, and determines the scale + at which QPainter will draw graphics on the image. It does not + change the scale or aspect ratio of the image when it is rendered + on other paint devices. - \sa dotsPerMeterY(), {QImage#Image Information}{Image - Information} + \sa dotsPerMeterY(), {QImage#Image Information}{Image Information} */ void QImage::setDotsPerMeterY(int y) { |