summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qbytearray.cpp4
-rw-r--r--src/corelib/text/qbytearray.cpp8
-rw-r--r--src/corelib/text/qbytearray.h4
-rw-r--r--src/plugins/platforms/wasm/qwasmfontdatabase.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qbytearray.cpp
index 2a780f1c49b..308fe0a5ac9 100644
--- a/src/corelib/doc/snippets/code/src_corelib_text_qbytearray.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_text_qbytearray.cpp
@@ -464,12 +464,12 @@ QByteArray decoded = encoded.percentDecoded(); // Set to "Qt is great!"
//! [55]
emscripten::val uint8array = emscripten::val::global("g_uint8array");
-QByteArray byteArray = QByteArray::fromUint8Array(uint8array);
+QByteArray byteArray = QByteArray::fromEcmaUint8Array(uint8array);
//! [55]
//! [56]
QByteArray byteArray = "test";
-emscripten::val uint8array = QByteArray::toUint8Array(byteArray);
+emscripten::val uint8array = QByteArray::toEcmaUint8Array(byteArray);
//! [56]
}
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 6227f773a9c..75301f1f512 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -4865,10 +4865,10 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA
\since 6.5
\ingroup platform-type-conversions
- \sa toUint8Array()
+ \sa toEcmaUint8Array()
*/
-QByteArray QByteArray::fromUint8Array(emscripten::val uint8array)
+QByteArray QByteArray::fromEcmaUint8Array(emscripten::val uint8array)
{
return qstdweb::Uint8Array(uint8array).copyToQByteArray();
}
@@ -4888,9 +4888,9 @@ QByteArray QByteArray::fromUint8Array(emscripten::val uint8array)
\since 6.5
\ingroup platform-type-conversions
- \sa toUint8Array()
+ \sa toEcmaUint8Array()
*/
-emscripten::val QByteArray::toUint8Array()
+emscripten::val QByteArray::toEcmaUint8Array()
{
return qstdweb::Uint8Array::copyFrom(*this).val();
}
diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
index 2f7070d539a..2c15545ecd5 100644
--- a/src/corelib/text/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
@@ -394,8 +394,8 @@ public:
#endif
#if defined(Q_OS_WASM) || defined(Q_QDOC)
- static QByteArray fromUint8Array(emscripten::val uint8array);
- emscripten::val toUint8Array();
+ static QByteArray fromEcmaUint8Array(emscripten::val uint8array);
+ emscripten::val toEcmaUint8Array();
#endif
typedef char *iterator;
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
index 7b8265ca23c..5fdaae8f84a 100644
--- a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
+++ b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp
@@ -106,7 +106,7 @@ void QWasmFontDatabase::populateFamily(const QString &familyName)
.thenFunc = [](val status) {
qCDebug(lcQpaFonts) << "onArrayBuffer" ;
- QByteArray fontByteArray = QByteArray::fromUint8Array(status);
+ QByteArray fontByteArray = QByteArray::fromEcmaUint8Array(status);
QFreeTypeFontDatabase::addTTFile(fontByteArray, QByteArray());