diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-08 16:05:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-11 12:58:16 +0000 |
| commit | 4d4fa829cd3ebeb284e691d7d928b67366f3cbf0 (patch) | |
| tree | aed1caf99dd5a3859f2922f3994a24a70a02a118 /src/core/clipboard_qt.cpp | |
| parent | 18cc8aa2893e62f2b2679e67ed4747243e25da35 (diff) | |
Extend context menu actions
Implements the several missing context menu actions for navigation and
image and media handling.
Change-Id: Ib8ea8311ea291fe2f98e509bc6f4034a5e0389c9
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/clipboard_qt.cpp')
| -rw-r--r-- | src/core/clipboard_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index f7ca9764d..027a93bac 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -331,7 +331,7 @@ SkBitmap ClipboardQt::ReadImage(ui::ClipboardType type) const const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); QImage image = qvariant_cast<QImage>(mimeData->imageData()); - Q_ASSERT(image.format() == QImage::Format_ARGB32); + image = image.convertToFormat(QImage::Format_ARGB32); SkBitmap bitmap; bitmap.setInfo(SkImageInfo::MakeN32(image.width(), image.height(), kOpaque_SkAlphaType)); bitmap.setPixels(const_cast<uchar*>(image.constBits())); |