1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dnd: Do not always Retrieve URLS in canConvertFromMime().

Browse Source 
Task-number: QTBUG-28186

Change-Id: I71d1a241d69f5fd80f6c047b9350cbd01bd48854
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2013-01-23 11:57:50 +01:00 committed by The Qt Project
parent fed2d237b7
commit 4807f70f89
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/qwindowsmime.cpp
View File

@ -703,14 +703,14 @@ QWindowsMimeURI::QWindowsMimeURI()
bool QWindowsMimeURI::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const 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(); QList<QUrl> urls = mimeData->urls();
for (int i=0; i<urls.size(); i++) { for (int i=0; i<urls.size(); i++) {
if (!urls.at(i).toLocalFile().isEmpty()) if (!urls.at(i).toLocalFile().isEmpty())
return true; 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 bool QWindowsMimeURI::convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM *pmedium) const