diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-16 22:00:18 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-16 22:00:18 (GMT) |
| commit | 0f71215693713fef4fd9dabeae8e6a574deff415 (patch) | |
| tree | 27d8a11e29f87813df5cbb644389cbfdfebc1abb /src/gui/image/qpixmap.cpp | |
| parent | acab3259e9f57e436f475b4c0d1d7e7fb194e983 (diff) | |
| parent | fc007d0a99cc52e673c5d2606e5076831f6103b1 (diff) | |
| download | Qt-0f71215693713fef4fd9dabeae8e6a574deff415.zip Qt-0f71215693713fef4fd9dabeae8e6a574deff415.tar.gz Qt-0f71215693713fef4fd9dabeae8e6a574deff415.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -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); } /*! |