diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-06 09:36:32 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-07-06 11:31:43 +0200 |
| commit | a5025efccfa877426dcdf31d91cacb1a6c52b276 (patch) | |
| tree | 24de4172a1ddcb92258fbe64b89d68e061f2a145 /src/corelib/text/qstringconverter_p.h | |
| parent | cd67fe582142b308f98eab30d057eceaee8d6d88 (diff) | |
Fix a crash in QClipBoard when copying utf16 data
Properly use the new QStringConverter API and not an internal
qFromUtfEncoded method that was buggy after the changes.
Take the oppportunity to clean up and remove qFromUtfEncoded, as
QClipboard was its only user.
Fixes: QTBUG-85417
Change-Id: I8540d12056bf3f448c1f628ce0bd0ad462a6447d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/text/qstringconverter_p.h')
| -rw-r--r-- | src/corelib/text/qstringconverter_p.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/text/qstringconverter_p.h b/src/corelib/text/qstringconverter_p.h index 83ffb889cb..2e897c47eb 100644 --- a/src/corelib/text/qstringconverter_p.h +++ b/src/corelib/text/qstringconverter_p.h @@ -331,12 +331,6 @@ struct Q_CORE_EXPORT QLocal8Bit #endif }; -/* - Converts from different utf encodings looking at a possible byte order mark at the - beginning of the string. If no BOM exists, utf-8 is assumed. - */ -Q_CORE_EXPORT QString qFromUtfEncoded(const QByteArray &ba); - QT_END_NAMESPACE #endif // QSTRINGCONVERTER_P_H |