diff options
author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2017-03-31 14:08:28 +0200 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2017-10-19 13:30:09 +0000 |
commit | 6c1a2224f31be51b26634f02fc2b2cb3247a4668 (patch) | |
tree | 2b5ff37617f173a65e8f821f0efe1abbc868d21e /src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | |
parent | fc988786588bf86ebc46fdd12629efbec8ae1841 (diff) |
iOS: add support for adding mimetypes other than text on the clipboard
A QVariant can only be converted to a QByteArray if it has user type
QMetaType::QByteArray or QMetaType::QString. The way it stood, we
always tried to convert the mime data to a QByteArray, and
then put the result into a QVariant. This would fail if the mime
data contained e.g a QPixmap.
This patch will inspect what kind of data the QMimeData contains, and
convert it to a QVariant using the expected API.
Backport of 6d3c483
Task-number: QTBUG-57428
Task-number: QTBUG-63660
Change-Id: I09b4a94aef7b52773e1a79c468ead71b36dfbfc5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm')
0 files changed, 0 insertions, 0 deletions