From d3be345a368941cc8e6b13851168d85354cc3e3c Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 24 Aug 2022 10:43:21 +1000 Subject: [PATCH] wasm: use uintptr_t for uint32_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This helps get ready for wasm64 Change-Id: I6db5b93c7ca851cab7fc95701b27a20263c8c0bd Reviewed-by: Mikołaj Boc Reviewed-by: Morten Johan Sørvig --- src/corelib/platform/wasm/qstdweb.cpp | 2 +- src/plugins/platforms/wasm/qwasmscreen.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/platform/wasm/qstdweb.cpp b/src/corelib/platform/wasm/qstdweb.cpp index 486bfaf4856..3a3cf4ada68 100644 --- a/src/corelib/platform/wasm/qstdweb.cpp +++ b/src/corelib/platform/wasm/qstdweb.cpp @@ -514,7 +514,7 @@ Uint8Array::Uint8Array(const ArrayBuffer &buffer, uint32_t offset, uint32_t leng // Constructs a Uint8Array which references an area on the heap. Uint8Array::Uint8Array(const char *buffer, uint32_t size) -:m_uint8Array(Uint8Array::constructor_().new_(Uint8Array::heap().buffer().m_arrayBuffer, uint32_t(buffer), size)) +:m_uint8Array(Uint8Array::constructor_().new_(Uint8Array::heap().buffer().m_arrayBuffer, uintptr_t(buffer), size)) { } diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp index 92a23c92069..69b65833a5a 100644 --- a/src/plugins/platforms/wasm/qwasmscreen.cpp +++ b/src/plugins/platforms/wasm/qwasmscreen.cpp @@ -38,7 +38,7 @@ QWasmScreen::QWasmScreen(const emscripten::val &containerOrCanvas) // Create the canvas (for the correct document) as a child of the container m_canvas = containerOrCanvas["ownerDocument"].call("createElement", std::string("canvas")); containerOrCanvas.call("appendChild", m_canvas); - std::string screenId = std::string("qtcanvas_") + std::to_string(uint32_t(this)); + std::string screenId = std::string("qtcanvas_") + std::to_string(uintptr_t(this)); m_canvas.set("id", screenId); // Make the canvas occupy 100% of parent @@ -171,7 +171,7 @@ std::string QWasmScreen::canvasSpecialHtmlTargetId() const { // Return a globally unique id for the canvas. We can choose any string, // as long as it starts with a "!". - return std::string("!qtcanvas_") + std::to_string(uint32_t(this)); + return std::string("!qtcanvas_") + std::to_string(uintptr_t(this)); } bool QWasmScreen::hasSpecialHtmlTargets() const