diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-04-20 16:57:29 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2016-04-21 08:17:37 +0000 |
| commit | 783db9da6962c331b126f0d2262a0c0600cf46ff (patch) | |
| tree | 5e1473fbe2421e832f3a752924ddde3bbc1e2748 /src/core/clipboard_qt.cpp | |
| parent | d236c5a8a34803bda6115956184398b99dbba408 (diff) | |
Fix copying images to clipboard
The SkBitmap to QImage conversion in ClipboardQt::WriteBitmap was
hardcoding the image format to ARGB32. This failed whenever the format
of the SkBitmap provided by Chromium was different.
This change backports 1cf9175e from 5.7.
Task-number: QTBUG-52715
Change-Id: Icf27b97bc421a2201c307a4514928dcf384d9ba6
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/clipboard_qt.cpp')
| -rw-r--r-- | src/core/clipboard_qt.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index 206392840..9ac5c7a17 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -240,8 +240,7 @@ void ClipboardQt::WriteWebSmartPaste() void ClipboardQt::WriteBitmap(const SkBitmap& bitmap) { - QImage image(reinterpret_cast<const uchar *>(bitmap.getPixels()), bitmap.width(), bitmap.height(), QImage::Format_ARGB32); - getUncommittedData()->setImageData(image.copy()); + getUncommittedData()->setImageData(toQImage(bitmap).copy()); } void ClipboardQt::WriteBookmark(const char* title_data, size_t title_len, const char* url_data, size_t url_len) |