From b013637f22851b5c8914e43f4ade8a0e1bfefd25 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Mon, 30 Jun 2014 13:32:13 +0200
Subject: [PATCH] QmlDesigner: remove delayed drag and drop call

Change-Id: I6d2c1c2f25ba88f3c6f0af9b52968a9bd005cd85
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
---
 .../qmldesigner/itemLibraryQmlSources/ItemDelegate.qml      | 2 +-
 .../components/itemlibrary/itemlibrarywidget.cpp            | 6 +-----
 .../qmldesigner/components/itemlibrary/itemlibrarywidget.h  | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
index 0a1c79da3b0..d3afcf07c6b 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
@@ -78,7 +78,7 @@ Rectangle {
         property int pressedY
 
         onPressed: {
-            rootView.startDragAndDropDelayed(itemLibraryEntry)
+            rootView.startDragAndDrop(itemLibraryEntry)
         }
     }
 }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 3a6b84fecd9..59dba2bdb78 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -369,14 +369,10 @@ void ItemLibraryWidget::setResourcePath(const QString &resourcePath)
     updateSearch();
 }
 
-void ItemLibraryWidget::startDragAndDropDelayed(QVariant itemLibraryId)
+void ItemLibraryWidget::startDragAndDrop(QVariant itemLibraryId)
 {
     m_currentitemLibraryEntry = itemLibraryId.value<ItemLibraryEntry>();
-    QTimer::singleShot(0, this, SLOT(startDragAndDrop()));
-}
 
-void ItemLibraryWidget::startDragAndDrop()
-{
     QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_currentitemLibraryEntry);
     QDrag *drag = new QDrag(this);
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index a934e155c47..4e96e8ff2aa 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -96,8 +96,7 @@ public slots:
 
     void setResourcePath(const QString &resourcePath);
 
-    void startDragAndDropDelayed(QVariant itemLibId);
-    void startDragAndDrop();
+    void startDragAndDrop(QVariant itemLibId);
 
     void setModel(Model *model);