Differential D19155 Diff 52082 3rdparty/ext_qt/0003-Hack-always-return-we-support-DIBV5.patch

Changeset View

Standalone View

View Options

3rdparty/ext_qt/0003-Hack-always-return-we-support-DIBV5.patch

  • This file was moved from 3rdparty/ext_qt/0002-Hack-always-return-we-support-DIBV5.patch.
1From 5e5026beb420018266d3d00fdb530bb714a841a6 Mon Sep 17 00:00:00 2001 1​From 6ce23924948d9697e07681bef44f0a47f9fd0d09 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:47 +0300 3​Date: Tue, 21 Jun 2016 14:50:47 +0300
4Subject: [PATCH 2/2] Hack: always return we support DIBV5 4​Subject: [PATCH 3/4] Hack: always return we support DIBV5
5 5​
6Asking for the entire image may be too expensive 6​Asking for the entire image may be too expensive
7 7​
8Change-Id: I44c38fad73f1bb5859eb58b941054eeb6c3c6b66 8​Change-Id: I44c38fad73f1bb5859eb58b941054eeb6c3c6b66
9--- 9​---
10 qtbase/src/plugins/platforms/windows/qwindowsmime.cpp | 4 +--- 10​ src/plugins/platforms/windows/qwindowsmime.cpp | 4 +---
11 1 file changed, 1 insertion(+), 3 deletions(-) 11​ 1 file changed, 1 insertion(+), 3 deletions(-)
12 12​
13diff --git a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp 13​diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
14index 90d646b..ef97db7 100644 14​index a702a2a90f..03f8948a86 100644
15--- a/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp 15​--- a/src/plugins/platforms/windows/qwindowsmime.cpp
16+++ b/qtbase/src/plugins/platforms/windows/qwindowsmime.cpp 16​+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
17@@ -1052,9 +1052,7 @@ QVector<FORMATETC> QWindowsMimeImage::formatsForMime(const QString &mimeType, co 17​@@ -1055,9 +1055,7 @@ QVector<FORMATETC> QWindowsMimeImage::formatsForMime(const QString &mimeType, co
18 QVector<FORMATETC> formatetcs; 18​ QVector<FORMATETC> formatetcs;
19 if (mimeData->hasImage() && mimeType == QLatin1String("application/x-qt-image")) { 19​ if (mimeData->hasImage() && mimeType == QLatin1String("application/x-qt-image")) {
20 //add DIBV5 if image has alpha channel. Do not add CF_PNG here as it will confuse MS Office (QTBUG47656). 20​ //add DIBV5 if image has alpha channel. Do not add CF_PNG here as it will confuse MS Office (QTBUG47656).
Context not available.
26 } 26​ }
27 if (!formatetcs.isEmpty()) 27​ if (!formatetcs.isEmpty())
28-- 28​--
292.6.4 29​2.20.1.windows.1
30 30​
Context not available.