From b242c100cb0dc82b6fadb0fea960ccab8b9ca6c4 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@theqtcompany.com>
Date: Tue, 8 Dec 2015 11:56:08 +0100
Subject: [PATCH] Qt Quick Designer: Enable HighDPI items in ItemLibrary

Item library icons and the drag pixmap could be avalible as
@2x variants.

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

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
index 896083223ce..8ce6ae7837a 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
@@ -24,6 +24,8 @@
 ****************************************************************************/
 #include "itemlibraryimageprovider.h"
 
+#include <utils/stylehelper.h>
+
 namespace QmlDesigner {
 
 namespace Internal {
@@ -35,7 +37,7 @@ ItemLibraryImageProvider::ItemLibraryImageProvider() :
 
 QPixmap ItemLibraryImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    QPixmap pixmap(id);
+    const QPixmap pixmap(Utils::StyleHelper::dpiSpecificImageFile(id));
     if (size) {
         size->setWidth(pixmap.width());
         size->setHeight(pixmap.height());
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index af66964b9f1..8aeb6aec50e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -356,7 +356,8 @@ void ItemLibraryWidget::startDragAndDrop(QVariant itemLibraryId)
     QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_currentitemLibraryEntry);
     QDrag *drag = new QDrag(this);
 
-    drag->setPixmap(m_currentitemLibraryEntry.libraryEntryIconPath());
+    drag->setPixmap(Utils::StyleHelper::dpiSpecificImageFile(
+                        m_currentitemLibraryEntry.libraryEntryIconPath()));
     drag->setMimeData(mimeData);
 
     drag->exec();