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 08:09:51 +0100 |
| commit | 082faeff9c4c5a5b10d140b391d30305575a898b (patch) | |
| tree | 505d176f243bfa3785a8aeb13138d3eba476175b /src/plugins/platforms/wasm/qwasmservices.cpp | |
| parent | be8c257da9a264994243c120231965ff0008ef09 (diff) | |
| parent | 1ed802e3b8a7f236bd277719090f461a87eae78e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/gui/image/qpnghandler.cpp
Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301
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; } |