3 files changed, 15 insertions, 31 deletions
diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h
index b57d7e50ccd..34e6bd84f3f 100644
--- a/src/corelib/kernel/qobject_impl.h
+++ b/src/corelib/kernel/qobject_impl.h
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef Q_QDOC
-
 #ifndef QOBJECT_H
 #error Do not include qobject_impl.h directly
 #endif
@@ -41,5 +39,3 @@ namespace QtPrivate {
 
 
 QT_END_NAMESPACE
-
-#endif
diff --git a/src/corelib/platform/wasm/qwasmsuspendresumecontrol.cpp b/src/corelib/platform/wasm/qwasmsuspendresumecontrol.cpp
index a081edcf542..5fe92926240 100644
--- a/src/corelib/platform/wasm/qwasmsuspendresumecontrol.cpp
+++ b/src/corelib/platform/wasm/qwasmsuspendresumecontrol.cpp
@@ -77,32 +77,20 @@ void qtRegisterEventHandlerJs(int index) {
             }[name];
         }
 
-        function deepShallowClone(parent, obj, depth) {
+        function deepShallowClone(obj) {
             if (obj === null)
                 return obj;
 
-            if (typeof obj === 'function') {
-                if (obj.name !== "")
-                    return createNamedFunction(obj.name, parent, obj);
-            }
-
-            if (depth >= 1)
-                return obj;
-
-            if (typeof obj !== 'object')
+            if (!(obj instanceof Event))
                 return obj;
 
-            if (Array.isArray(obj)) {
-                const arrCopy = [];
-                for (let i = 0; i < obj.length; i++)
-                    arrCopy[i] = deepShallowClone(obj, obj[i], depth + 1);
-
-                return arrCopy;
-            }
-
             const objCopy = {};
-            for (const key in obj)
-                objCopy[key] = deepShallowClone(obj, obj[key], depth + 1);
+            for (const key in obj) {
+                if (typeof obj[key] === 'function')
+                    objCopy[key] = createNamedFunction(obj[key].name, obj, obj[key]);
+                else
+                    objCopy[key] = obj[key];
+            }
 
             return objCopy;
         }
@@ -112,7 +100,7 @@ void qtRegisterEventHandlerJs(int index) {
         let handler = (arg) => {
             // Copy the top level object, alias the rest.
             // functions are copied by creating new forwarding functions.
-            arg = deepShallowClone(arg, arg, 0);
+            arg = deepShallowClone(arg);
 
             // Add event to event queue
             control.pendingEvents.push({
diff --git a/src/corelib/text/qlocale_icu.cpp b/src/corelib/text/qlocale_icu.cpp
index a10ae1c84b2..7e1dba5ee92 100644
--- a/src/corelib/text/qlocale_icu.cpp
+++ b/src/corelib/text/qlocale_icu.cpp
@@ -17,10 +17,10 @@ static_assert(std::is_same_v<UChar, char16_t>,
 
 namespace QtIcuPrivate {
 
-enum class CaseConversion : bool { Upper, Lower };
+enum class IcuCaseConversion : bool { Upper, Lower };
 
 static bool qt_u_strToCase(const QString &str, QString *out, const char *localeID,
-                           CaseConversion conv)
+                           IcuCaseConversion conv)
 {
     Q_ASSERT(out);
 
@@ -34,9 +34,9 @@ static bool qt_u_strToCase(const QString &str, QString *out, const char *localeI
             // try to be a completely transparent wrapper:
             using R [[maybe_unused]] = decltype(u_strToUpper(std::forward<decltype(args)>(args)...));
             switch (conv) {
-            case CaseConversion::Upper:
+            case IcuCaseConversion::Upper:
                 return u_strToUpper(std::forward<decltype(args)>(args)...);
-            case CaseConversion::Lower:
+            case IcuCaseConversion::Lower:
                 return u_strToLower(std::forward<decltype(args)>(args)...);
             };
             Q_UNREACHABLE_RETURN(R{0});
@@ -79,7 +79,7 @@ QString QLocalePrivate::toUpper(const QString &str, bool *ok) const
     Q_ASSERT(ok);
     using namespace QtIcuPrivate;
     QString out;
-    *ok = qt_u_strToCase(str, &out, bcp47Name('_'), CaseConversion::Upper);
+    *ok = qt_u_strToCase(str, &out, bcp47Name('_'), IcuCaseConversion::Upper);
     return out;
 }
 
@@ -88,7 +88,7 @@ QString QLocalePrivate::toLower(const QString &str, bool *ok) const
     Q_ASSERT(ok);
     using namespace QtIcuPrivate;
     QString out;
-    *ok = qt_u_strToCase(str, &out, bcp47Name('_'), CaseConversion::Lower);
+    *ok = qt_u_strToCase(str, &out, bcp47Name('_'), IcuCaseConversion::Lower);
     return out;
 }