diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2023-08-25 00:37:25 +0200 |
|---|---|---|
| committer | Morten Sørvig <morten.sorvig@qt.io> | 2023-08-30 23:02:03 +0200 |
| commit | c802a9e987c9e38c01580f467eab92a651b3e033 (patch) | |
| tree | adcbe064270b820902cfe38c3df804c5786bf561 /src/plugins/platforms/wasm/qwasmintegration.cpp | |
| parent | 9900a12df649229c9ff9e2115ac90fb7f634da1d (diff) | |
wasm: rename JsString -> EcmaString
QString::fromJsString -> QString::fromEcmaString()
QString::toJsString() -> QString::toEcmaString()
For API naming compatibility with QByteArray::fromEcmaUin8Array()
Pick-to: 6.6
Change-Id: If6e2121e31e630d6728ed24e41d14b763f395aaa
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index 473df5f66d..778c769ae1 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -373,7 +373,7 @@ void QWasmIntegration::resizeScreen(const emscripten::val &element) [&] (const ScreenMapping &candidate) { return candidate.emscriptenVal.equals(element); }); if (it == m_screens.end()) { qWarning() << "Attempting to resize non-existing screen for element" - << QString::fromJsString(element["id"]); + << QString::fromEcmaString(element["id"]); return; } it->wasmScreen->updateQScreenAndCanvasRenderSize(); |