diff options
author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-12-30 13:41:40 +0100 |
---|---|---|
committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-01-13 21:07:14 +0100 |
commit | 2e97ccc8d0e3c1fa0fe34e01d1d3e6f8cd7465ba (patch) | |
tree | 4a5094bb2cc1b700c2884e2b1a32226110b7ba45 /src/plugins/platforms/wasm/qwasmintegration.cpp | |
parent | 4dbb07f614c914e78437aacf7a1716f632da5e8a (diff) |
Add QString<->emscripten::val conversion functions
Following the QRect, add functions converting the QString to native
emscripten::val and back: fromJsString, toJsString
Change-Id: I2d0625ede3bbf7249e2e91b8de298b5b91df8ba2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmintegration.cpp')
-rw-r--r-- | src/plugins/platforms/wasm/qwasmintegration.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index 4c6f1b14c8..fa4ae981bb 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -11,7 +11,6 @@ #include "qwasmaccessibility.h" #include "qwasmservices.h" #include "qwasmoffscreensurface.h" -#include "qwasmstring.h" #include "qwasmwindow.h" #include "qwasmbackingstore.h" @@ -287,7 +286,8 @@ void QWasmIntegration::removeScreen(const emscripten::val &element) auto it = std::find_if(m_screens.begin(), m_screens.end(), [&] (const QPair<emscripten::val, QWasmScreen *> &candidate) { return candidate.first.equals(element); }); if (it == m_screens.end()) { - qWarning() << "Attempting to remove non-existing screen for element" << QWasmString::toQString(element["id"]);; + qWarning() << "Attempting to remove non-existing screen for element" + << QString::fromJsString(element["id"]); return; } it->second->deleteScreen(); @@ -299,7 +299,8 @@ void QWasmIntegration::resizeScreen(const emscripten::val &element) auto it = std::find_if(m_screens.begin(), m_screens.end(), [&] (const QPair<emscripten::val, QWasmScreen *> &candidate) { return candidate.first.equals(element); }); if (it == m_screens.end()) { - qWarning() << "Attempting to resize non-existing screen for element" << QWasmString::toQString(element["id"]);; + qWarning() << "Attempting to resize non-existing screen for element" + << QString::fromJsString(element["id"]); return; } it->second->updateQScreenAndCanvasRenderSize(); |