diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:29:41 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:30:21 +0100 |
| commit | b5ab7ee0d78a30863e3d11bd2ba10ba5f4854bf5 (patch) | |
| tree | d4ab3471f9f92e153fe320e0435a5740c794746b /src/gui/image/qimage.cpp | |
| parent | ad9554a7f2d4b8a2af3efabc7bc69b9a0ae3751d (diff) | |
| parent | aff3e3c4a20aae52fdafaede8dfcbde2bc990104 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede
Diffstat (limited to 'src/gui/image/qimage.cpp')
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index be634b2462..61d524841d 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1426,7 +1426,7 @@ qreal QImage::devicePixelRatio() const } /*! - Sets the the device pixel ratio for the image. This is the + Sets the device pixel ratio for the image. This is the ratio between image pixels and device-independent pixels. The default \a scaleFactor is 1.0. Setting it to something else has |