diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:09 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-28 16:02:04 +0100 |
| commit | 6c3eb39832876a65291546476b92fd94950b1208 (patch) | |
| tree | 2d551aab7fce80b2ef603f1cfc42bf6f9d0e4411 /src/plugins/platforms/wasm/qwasmservices.cpp | |
| parent | fcd3a20059d0c629d972ba2577694394b438a100 (diff) | |
| parent | 082faeff9c4c5a5b10d140b391d30305575a898b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmservices.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmservices.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/wasm/qwasmservices.cpp b/src/plugins/platforms/wasm/qwasmservices.cpp index 9328b8c065..4eee3fe972 100644 --- a/src/plugins/platforms/wasm/qwasmservices.cpp +++ b/src/plugins/platforms/wasm/qwasmservices.cpp @@ -28,6 +28,8 @@ ****************************************************************************/ #include "qwasmservices.h" +#include "qwasmstring.h" + #include <QtCore/QUrl> #include <QtCore/QDebug> @@ -37,8 +39,8 @@ QT_BEGIN_NAMESPACE bool QWasmServices::openUrl(const QUrl &url) { - QByteArray utf8Url = url.toString().toUtf8(); - emscripten::val::global("window").call<void>("open", emscripten::val(utf8Url.constData()), emscripten::val("_blank")); + emscripten::val jsUrl = QWasmString::fromQString(url.toString()); + emscripten::val::global("window").call<void>("open", jsUrl, emscripten::val("_blank")); return true; } |