diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-07 11:50:58 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-24 23:44:51 +0200 |
| commit | f6bd056803e389ef19d699932fe2c3cb23c1e4af (patch) | |
| tree | da5707dce6f27f69d09a3345b95906f45ca71b37 /src/plugins/platforms/xcb/qxcbdrag.cpp | |
| parent | 5f013bc10f825f63f33a2b073c5883895e992429 (diff) | |
Remove the QTextCodec dependency from the xcb plugin
Change-Id: Ic9f4cec4aa7270b8d9e16c345d060d7d820319d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbdrag.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index cc735f40a8..ab4acbe727 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -1362,8 +1362,8 @@ QVariant QXcbDropData::xdndObtainData(const QByteArray &format, QMetaType::Type } QVector<xcb_atom_t> atoms = drag->xdnd_types; - QByteArray encoding; - xcb_atom_t a = mimeAtomForFormat(c, QLatin1String(format), requestedType, atoms, &encoding); + bool hasUtf8 = false; + xcb_atom_t a = mimeAtomForFormat(c, QLatin1String(format), requestedType, atoms, &hasUtf8); if (a == XCB_NONE) return result; @@ -1375,7 +1375,7 @@ QVariant QXcbDropData::xdndObtainData(const QByteArray &format, QMetaType::Type result = c->clipboard()->getSelection(xdnd_selection, a, xdnd_selection, drag->targetTime()); #endif - return mimeConvertToFormat(c, a, result, QLatin1String(format), requestedType, encoding); + return mimeConvertToFormat(c, a, result, QLatin1String(format), requestedType, hasUtf8); } bool QXcbDropData::hasFormat_sys(const QString &format) const |