diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
| commit | 22796b38c3a7dbcdb540e4c58e645b0267fe360c (patch) | |
| tree | dab9604e944d0184249ac2dceca7b6b16adba39e /src/gui/image/qpixmap.cpp | |
| parent | b958102dfa36a3554911adb8fdb21375f0ecb48c (diff) | |
| parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
| download | Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.zip Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.gz Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 30eb788..0a208bb 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -357,7 +357,9 @@ QPixmap QPixmap::copy(const QRect &rect) const if (isNull()) return QPixmap(); - const QRect r = rect.isEmpty() ? QRect(0, 0, width(), height()) : rect; + QRect r(0, 0, width(), height()); + if (!rect.isEmpty()) + r = r.intersected(rect); QPixmapData *d = data->createCompatiblePixmapData(); d->copy(data.data(), r); |