summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Masoud Abdol <amir.abdol@qt.io>2023-04-13 12:17:29 +0200
committerAmir Masoud Abdol <amir.abdol@qt.io>2023-04-13 20:16:08 +0200
commit9031142e63b954031134d12b8e9fb1f9c850acfa (patch)
tree3671b25a4f85f45a8bbd2de71c34312f2faf7b9a
parentc91ae574edcd2dfb3a4364c34295886abf012704 (diff)
Replace a duplicate symbol
Removed the two identical functions and directly call the `static_cast` in their place. This is to resolve a build issue when doing unity build. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I174b601e06c4acdea45cc66495c09aafba6f48f6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
-rw-r--r--src/plugins/platforms/wasm/qwasmaccessibility.cpp10
-rw-r--r--src/plugins/platforms/wasm/qwasmcompositor.cpp6
2 files changed, 3 insertions, 13 deletions
diff --git a/src/plugins/platforms/wasm/qwasmaccessibility.cpp b/src/plugins/platforms/wasm/qwasmaccessibility.cpp
index 072f65aa87..0509e69c13 100644
--- a/src/plugins/platforms/wasm/qwasmaccessibility.cpp
+++ b/src/plugins/platforms/wasm/qwasmaccessibility.cpp
@@ -21,13 +21,6 @@ Q_LOGGING_CATEGORY(lcQpaAccessibility, "qt.qpa.accessibility")
// events. In addition or alternatively, we could also walk the accessibility tree
// from setRootObject().
-namespace {
-QWasmWindow *asWasmWindow(QWindow *window)
-{
- return static_cast<QWasmWindow*>(window->handle());
-}
-} // namespace
-
QWasmAccessibility::QWasmAccessibility()
{
@@ -105,7 +98,8 @@ void QWasmAccessibility::enableAccessibility()
emscripten::val QWasmAccessibility::getContainer(QWindow *window)
{
- return window ? asWasmWindow(window)->a11yContainer() : emscripten::val::undefined();
+ return window ? static_cast<QWasmWindow *>(window->handle())->a11yContainer()
+ : emscripten::val::undefined();
}
emscripten::val QWasmAccessibility::getContainer(QAccessibleInterface *iface)
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index 1fafd5d9e8..5deba23548 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -9,10 +9,6 @@
#include <emscripten/html5.h>
namespace {
-QWasmWindow *asWasmWindow(QWindow *window)
-{
- return static_cast<QWasmWindow*>(window->handle());
-}
QWasmWindowStack::PositionPreference positionPreferenceFromWindowFlags(Qt::WindowFlags flags)
{
@@ -191,7 +187,7 @@ void QWasmCompositor::handleBackingStoreFlush(QWindow *window)
// Request update to flush the updated backing store content, unless we are currently
// processing an update, in which case the new content will flushed as a part of that update.
if (!m_inDeliverUpdateRequest)
- requestUpdateWindow(asWasmWindow(window));
+ requestUpdateWindow(static_cast<QWasmWindow *>(window->handle()));
}
void QWasmCompositor::frame(const QList<QWasmWindow *> &windows)