From a5fb3ad669de8d9d5f9fb4eb8b00268d0828c19a Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Thu, 5 Jun 2014 16:34:41 +0200
Subject: [PATCH] QmlDesigner: Use library entry icon for DnD in item library

Change-Id: Ie8a55c352eddcfec3591e2174373bed524a81dac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 .../qmldesigner/components/itemlibrary/itemlibrarymodel.cpp   | 4 ++--
 .../qmldesigner/components/itemlibrary/itemlibrarymodel.h     | 2 +-
 .../qmldesigner/components/itemlibrary/itemlibrarywidget.cpp  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 4891bac732e..f82d573e515 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -224,9 +224,9 @@ QMimeData *ItemLibraryModel::getMimeData(int libId)
 }
 
 
-QIcon ItemLibraryModel::getTypeIcon(int libId)
+QPixmap ItemLibraryModel::getLibraryEntryIcon(int libId)
 {
-    return m_itemInfos.value(libId).typeIcon();
+    return QPixmap(m_itemInfos.value(libId).libraryEntryIconPath());
 }
 
 ItemLibrarySection *ItemLibraryModel::section(int libraryId)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 5c0ff9fd31d..03f1b814f6a 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -62,7 +62,7 @@ public:
 
     QString getTypeName(int libId);
     QMimeData *getMimeData(int libId);
-    QIcon getTypeIcon(int libId);
+    QPixmap getLibraryEntryIcon(int libId);
 
     ItemLibrarySection* section(int libraryId);
     QList<ItemLibrarySection*> sections() const;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 283e1399923..47b458abed9 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -389,7 +389,7 @@ void ItemLibraryWidget::startDragAndDrop()
     QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_itemLibraryId);
     QDrag *drag = new QDrag(this);
 
-    drag->setPixmap(m_itemLibraryModel->getTypeIcon(m_itemLibraryId).pixmap(32, 32));
+    drag->setPixmap(m_itemLibraryModel->getLibraryEntryIcon(m_itemLibraryId));
     drag->setMimeData(mimeData);
 
     drag->exec();