4 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index b04051f3597..f59f3e2aed2 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -351,7 +351,8 @@ public:
     template<typename T>
     inline QNoDebug &operator<<(const T &) { return *this; }
 };
-inline QNoDebug QMessageLogger::noDebug(...) const noexcept
+
+QNoDebug QMessageLogger::noDebug(...) const noexcept
 { return {}; }
 
 inline QDebug &QDebug::operator=(const QDebug &other)
diff --git a/src/corelib/text/qvsnprintf.cpp b/src/corelib/text/qvsnprintf.cpp
index 522c56fb800..abe3dd6772d 100644
--- a/src/corelib/text/qvsnprintf.cpp
+++ b/src/corelib/text/qvsnprintf.cpp
@@ -5,10 +5,10 @@
 #include "qplatformdefs.h"
 
 #include "qbytearray.h"
-#include <QtCore/private/qnumeric_p.h>
 #include "qstring.h"
 
 #include <cerrno>
+#include <QtCore/q26numeric.h>
 
 #include "string.h"
 
@@ -68,7 +68,7 @@ int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
     const auto realSize = ba.size();
     int result;
     if constexpr (sizeof(int) != sizeof(realSize)) {
-        result = qt_saturate<int>(realSize);
+        result = q26::saturate_cast<int>(realSize);
         if (result != realSize) {
             errno = EOVERFLOW;
             return -1;
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index cc32eb4d1e9..08fa4365fae 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -34,7 +34,6 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QThread>
-#include <QtCore/private/qthread_p.h>
 
 #include <QtWaylandClient/private/qwayland-fractional-scale-v1.h>
 
@@ -713,7 +712,7 @@ void QWaylandWindow::applyConfigure()
     if (!mWaitingToApplyConfigure)
         return;
 
-    Q_ASSERT_X(QThread::currentThreadId() == QThreadData::get2(thread())->threadId.loadRelaxed(),
+    Q_ASSERT_X(QThread::isMainThread(),
                "QWaylandWindow::applyConfigure", "not called from main thread");
 
     // If we're mid paint, use an exposeEvent to flush the current frame.
@@ -1081,7 +1080,7 @@ Qt::WindowFlags QWaylandWindow::windowFlags() const
 
 bool QWaylandWindow::createDecoration()
 {
-    Q_ASSERT_X(QThread::currentThreadId() == QThreadData::get2(thread())->threadId.loadRelaxed(),
+    Q_ASSERT_X(QThread::isMainThread(),
                "QWaylandWindow::createDecoration", "not called from main thread");
     // TODO: client side decorations do not work with Vulkan backend.
     if (window()->surfaceType() == QSurface::VulkanSurface)
diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h
index 0cbcc5321d4..262207f40c8 100644
--- a/src/widgets/kernel/qwindowcontainer_p.h
+++ b/src/widgets/kernel/qwindowcontainer_p.h
@@ -30,7 +30,7 @@ class Q_WIDGETS_EXPORT QWindowContainer : public QWidget
 public:
     explicit QWindowContainer(QWindow *embeddedWindow, QWidget *parent = nullptr, Qt::WindowFlags f = { });
     ~QWindowContainer();
-    QWindow *containedWindow() const;
+    Q_INVOKABLE QWindow *containedWindow() const;
     QSize minimumSizeHint() const override;
 
     static void toplevelAboutToBeDestroyed(QWidget *parent);