From e4dd8e75d1fed57750c0fefca7e006c303d28317 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 19 Nov 2013 17:44:16 +0100 Subject: [PATCH] QmlDesigner.ItemLibrary: Fix Drag Drop on Mac OS X Since grabMouse() is limited on Mac OS X, we cannot use the custom drag and drop code anymore. The icon stays visible. Task-number: QTBUG-34201 Task-number: QTCREATORBUG-10414 Change-Id: I92009c34881d086049e50b0c9ef109a7149ac657 Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/itemlibrary/itemlibrarywidget.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index a1334a5068..ad7edd745c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -366,15 +366,13 @@ void ItemLibraryWidget::setResourcePath(const QString &resourcePath) void ItemLibraryWidget::startDragAndDrop(int itemLibId) { QMimeData *mimeData = m_itemLibraryModel->getMimeData(itemLibId); - CustomItemLibraryDrag *drag = new CustomItemLibraryDrag(this); + QDrag *drag = new QDrag(this); const QImage image = qvariant_cast(mimeData->imageData()); drag->setPixmap(m_itemLibraryModel->getIcon(itemLibId).pixmap(32, 32)); - drag->setPreview(QPixmap::fromImage(image)); drag->setMimeData(mimeData); QQuickItem *rootItem = qobject_cast(m_itemsView->rootObject()); - connect(rootItem, SIGNAL(stopDragAndDrop()), drag, SLOT(stopDrag())); drag->exec(); } -- GitLab