Differential D19155 Diff 52082 3rdparty/ext_qt/0002-Don-t-request-the-MIME-image-every-time-Windows-asks.patch

Changeset View

Standalone View

View Options

3rdparty/ext_qt/0002-Don-t-request-the-MIME-image-every-time-Windows-asks.patch

  • This file was moved from 3rdparty/ext_qt/0001-Don-t-request-the-MIME-image-every-time-Windows-asks.patch.
1From 674cfce97c4972176d2bcb55d7013c0ac2190029 Mon Sep 17 00:00:00 2001 1​From 9081571e58ceeaa4c623c83ecb41b04dfc7d90f9 Mon Sep 17 00:00:00 2001
2From: Dmitry Kazakov <dimula73@gmail.com> 2​From: Dmitry Kazakov <dimula73@gmail.com>
3Date: Tue, 21 Jun 2016 14:50:07 +0300 3​Date: Tue, 21 Jun 2016 14:50:07 +0300
4Subject: [PATCH 1/2] Don't request the MIME image every time Windows asks for 4​Subject: [PATCH 2/4] Don't request the MIME image every time Windows asks for
5 the list of supported types 5​ the list of supported types
6 6​
7Change-Id: I05516d83dc4e0f192bc94f92cefc722f25dae4d4 7​Change-Id: I05516d83dc4e0f192bc94f92cefc722f25dae4d4
8--- 8​---
9 qtbase/src/plugins/platforms/windows/qwindowsmime.cpp | 9 ++++++--- 9​ src/plugins/platforms/windows/qwindowsmime.cpp | 9 ++++++---
10 1 file changed, 6 insertions(+), 3 deletions(-) 10​ 1 file changed, 6 insertions(+), 3 deletions(-)
11 11​
12diff --git a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp 12​diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
13index a8264b5..90d646b 100644 13​index ff0dccb0d9..a702a2a90f 100644
14--- a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp 14​--- a/src/plugins/platforms/windows/qwindowsmime.cpp
15+++ b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp 15​+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
16@@ -1081,12 +1081,15 @@ bool QWindowsMimeImage::canConvertToMime(const QString &mimeType, IDataObject *p 16​@@ -1082,12 +1082,15 @@ bool QWindowsMimeImage::canConvertToMime(const QString &mimeType, IDataObject *p
17 bool QWindowsMimeImage::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const 17​ bool QWindowsMimeImage::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const
18 { 18​ {
19 int cf = getCf(formatetc); 19​ int cf = getCf(formatetc);
Context not available.
33 33​
34 bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM * pmedium) const 34​ bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM * pmedium) const
35-- 35​--
362.6.4 36​2.20.1.windows.1
37 37​
Context not available.