diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:16:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:19:31 +0200 |
| commit | 7f8719e663edae8b08d34cc67cb5000e8402d3d7 (patch) | |
| tree | b098d2c8077a88c2ada577ac874e1416adaf66f7 /src/gui/image/qimage.h | |
| parent | af851c290b7cea22f26bb8c852b0029696469d74 (diff) | |
| parent | eb82959d6688f9e58be4b67670afba3649f1f799 (diff) | |
Merge remote-tracking branch 'origin/5.5' into HEAD
Change-Id: I487a4b7c05687a10c498ac219c31367d4db6fbc0
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 7751bbe3d3..0ccbab819f 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -335,6 +335,7 @@ protected: void rgbSwapped_inplace(); QImage convertToFormat_helper(Format format, Qt::ImageConversionFlags flags) const; bool convertToFormat_inplace(Format format, Qt::ImageConversionFlags flags); + QImage smoothScaled(int w, int h) const; private: friend class QWSOnScreenSurface; |