From 4807f70f89f9480052920b01ccefee97862be2e4 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 23 Jan 2013 11:57:50 +0100
Subject: Dnd: Do not always Retrieve URLS in canConvertFromMime().

Task-number: QTBUG-28186

Change-Id: I71d1a241d69f5fd80f6c047b9350cbd01bd48854
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/plugins/platforms/windows/qwindowsmime.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index 7fb32d3513..a8bacd631d 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -703,14 +703,14 @@ QWindowsMimeURI::QWindowsMimeURI()
 
 bool QWindowsMimeURI::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const
 {
-    if (getCf(formatetc) == CF_HDROP) {
+    if (mimeData->hasUrls() && getCf(formatetc) == CF_HDROP) {
         QList<QUrl> urls = mimeData->urls();
         for (int i=0; i<urls.size(); i++) {
             if (!urls.at(i).toLocalFile().isEmpty())
                 return true;
         }
     }
-    return (getCf(formatetc) == CF_INETURL_W || getCf(formatetc) == CF_INETURL) && mimeData->hasFormat(QStringLiteral("text/uri-list"));
+    return (getCf(formatetc) == CF_INETURL_W || getCf(formatetc) == CF_INETURL) && mimeData->hasUrls();
 }
 
 bool QWindowsMimeURI::convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM *pmedium) const
-- 
cgit v1.2.3