diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-08 15:51:04 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-09 19:45:43 +0000 |
| commit | b1709bdc723ee62d13cdb11d77e4fbe03a0c44bf (patch) | |
| tree | a8f29330c9db1293e4e65161bb32790e87f51cdd /src/plugins/platforms/windows/qwindowsmime.cpp | |
| parent | 1d1dcd8d6c64a35b94b351f72cc447771834df49 (diff) | |
Windows QPA: Fix Drag and Drop of images onto MS PowerPoint
Use the PNG format only for transparent images.
Fixes: QTBUG-64322
Change-Id: I5e02132ca446876e20fcf46f2ef8daa599e85e71
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsmime.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsmime.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp index 96e34fb44c..030d8d1e0f 100644 --- a/src/plugins/platforms/windows/qwindowsmime.cpp +++ b/src/plugins/platforms/windows/qwindowsmime.cpp @@ -1087,7 +1087,10 @@ bool QWindowsMimeImage::canConvertFromMime(const FORMATETC &formatetc, const QMi const QImage image = qvariant_cast<QImage>(mimeData->imageData()); if (image.isNull()) return false; - return cf == CF_DIBV5 || (cf == CF_DIB) || cf == int(CF_PNG); + // QTBUG-64322: Use PNG only for transparent images as otherwise MS PowerPoint + // cannot handle it. + return cf == CF_DIBV5 || cf == CF_DIB + || (cf == int(CF_PNG) && image.hasAlphaChannel()); } bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData, STGMEDIUM * pmedium) const |