summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorDavid Faure <david.faure@kdab.com>2014-06-11 11:48:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-11 23:06:01 +0200
commit11aaff3a57afe7a8ff37bfa83cc545cc04c38649 (patch)
treecf114566099b04d4e192dc4d8b118ccc2efdd281 /src/gui/image
parentd06c6d8a51c9bd79396471f4131ac67f1d11e2c2 (diff)
Add missing detach() in QPixmap::convertFromImage()
Task-number: QTBUG-18519 Change-Id: I5d929cf6eda3f34130314edac95487fb00a95db5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmap.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 86c4dfbdca..c6d8d19bb1 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1098,6 +1098,7 @@ bool QPixmap::isDetached() const
*/
bool QPixmap::convertFromImage(const QImage &image, Qt::ImageConversionFlags flags)
{
+ detach();
if (image.isNull() || !data)
*this = QPixmap::fromImage(image, flags);
else