diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp index 4ae448e62..6fad021f6 100644 --- a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp +++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp @@ -39,8 +39,13 @@ QString WKStringCopyQString(WKStringRef stringRef) { if (!stringRef) return QString(); - const WTF::String& string = toImpl(stringRef)->string(); - return QString(reinterpret_cast<const QChar*>(string.characters()), string.length()); + + auto stringView = toImpl(stringRef)->stringView(); + + if (stringView.is8Bit()) + return QString::fromLatin1(reinterpret_cast<const char*>(stringView.characters8()), stringView.length()); + + return QString(reinterpret_cast<const QChar*>(stringView.characters16()), stringView.length()); } namespace WebKit { |