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/qxcbclipboard.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/qxcbclipboard.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbclipboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index fe9ddfece7..d4a5200a04 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -138,13 +138,13 @@ protected: for (int i = 0; i < size; ++i) atoms.append(targets[i]); - QByteArray encoding; - xcb_atom_t fmtatom = mimeAtomForFormat(m_clipboard->connection(), fmt, requestedType, atoms, &encoding); + bool hasUtf8 = false; + xcb_atom_t fmtatom = mimeAtomForFormat(m_clipboard->connection(), fmt, requestedType, atoms, &hasUtf8); if (fmtatom == 0) return QVariant(); - return mimeConvertToFormat(m_clipboard->connection(), fmtatom, m_clipboard->getDataInFormat(modeAtom, fmtatom), fmt, requestedType, encoding); + return mimeConvertToFormat(m_clipboard->connection(), fmtatom, m_clipboard->getDataInFormat(modeAtom, fmtatom), fmt, requestedType, hasUtf8); } private: |