From: Teemu Katajisto <teemu.katajisto@digia.com>
Date: Tue, 16 Oct 2012 09:06:14 +0000 (+0300)
Subject: Cocoa: use defaultPixmap() if pixmap is not set for drag
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4135951ae8162c4f8ca557eefb8cd2db39f759b0;p=profile%2Fivi%2Fqtbase.git

Cocoa: use defaultPixmap() if pixmap is not set for drag

Task-number: QTBUG-26971

Change-Id: I6aed56a6b292c5aeebf38278d2a1fa982346c909
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---

diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index d98c49a..67881d8 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -119,7 +119,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
     m_drag = o;
     m_executed_drop_action = Qt::IgnoreAction;
 
-    NSImage *nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(m_drag->pixmap()));
+    QPixmap pm = m_drag->pixmap();
+    if (pm.isNull())
+        pm = defaultPixmap();
+
+    NSImage *nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
 
     QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacPasteboardMime::MIME_DND);
     m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));