diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 11:05:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 11:05:38 +0100 |
| commit | 2d0c80018e6da8193a6c5bd5d764da509e16ab46 (patch) | |
| tree | e6ffaf8ec73f6cade2d5fbd17b3ba6d27c790a77 /src/client/qwaylandclipboard.cpp | |
| parent | e6805407b62c9c57bac488813f77ee5cca71868e (diff) | |
| parent | 8458e06b25c07ebc8cf6b210fc1ea4cc9aeb42eb (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/client/qwaylanddataoffer.cpp
src/client/qwaylanddisplay.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/qwaylandsurfaceitem.cpp
Change-Id: I2eae0fd43a71fbfd7c907ca715707a26f3c134c5
Diffstat (limited to 'src/client/qwaylandclipboard.cpp')
| -rw-r--r-- | src/client/qwaylandclipboard.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/qwaylandclipboard.cpp b/src/client/qwaylandclipboard.cpp index 226a374ab..3e25875f0 100644 --- a/src/client/qwaylandclipboard.cpp +++ b/src/client/qwaylandclipboard.cpp @@ -88,6 +88,10 @@ void QWaylandClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) if (!inputDevice || !inputDevice->dataDevice()) return; + static const QString plain = QStringLiteral("text/plain"); + static const QString utf8 = QStringLiteral("text/plain;charset=utf-8"); + if (data && data->hasFormat(plain) && !data->hasFormat(utf8)) + data->setData(utf8, data->data(plain)); inputDevice->dataDevice()->setSelectionSource(data ? new QWaylandDataSource(mDisplay->dndSelectionHandler(), data) : 0); emitChanged(mode); |