diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-09-16 07:53:32 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-09-16 08:59:07 (GMT) |
| commit | 82575a9f6123eed3e8581b6e73833924fe47cace (patch) | |
| tree | 734121ddd0187cb110829654312a2e8c05bdd221 /src/gui | |
| parent | b1cea5eb85645450b29fd673795325ed0d4d7009 (diff) | |
| download | Qt-82575a9f6123eed3e8581b6e73833924fe47cace.zip Qt-82575a9f6123eed3e8581b6e73833924fe47cace.tar.gz Qt-82575a9f6123eed3e8581b6e73833924fe47cace.tar.bz2 | |
Fixed regression in QPixmap::size() for null pixmaps.
After change 79eef278228aac21fbf QPixmap::size() started returning
QSize(-1, -1) for null pixmaps. This restores the old behavior of
returning QSize(0, 0), and is symmetric with QImage::size().
Task-number: QT-3934
Reviewed-by: Trond
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index c039ca8..66a861d 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -579,7 +579,7 @@ int QPixmap::height() const */ QSize QPixmap::size() const { - return data ? QSize(data->width(), data->height()) : QSize(); + return data ? QSize(data->width(), data->height()) : QSize(0, 0); } /*! |