3 files changed, 11 insertions, 12 deletions
diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index 7e3589def6b..0ce9a4b091c 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -17,14 +17,6 @@ qt_internal_add_module(WaylandGlobalPrivate
     NO_GENERATE_CPP_EXPORTS
 )
 
-# Work around 115101.
-# If nothing depends on the WaylandGlobalPrivate target it doesn't run custom commands that the
-# target depends on. WaylandGlobalPrivate_ensure_sync_headers makes sure that 'all' depends on
-# WaylandGlobalPrivate_sync_headers.
-# TODO: This needs to be removed once the fix for QTBUG-115101 is merged in qtbase.
-add_custom_target(WaylandGlobalPrivate_ensure_sync_headers ALL)
-add_dependencies(WaylandGlobalPrivate_ensure_sync_headers WaylandGlobalPrivate_sync_headers)
-
 # special case begin
 # TODO: Ideally these macros would be part of the qtwaylandscanner tool, and not the compositor/client
 include(../../../../src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake)
diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
index 92c746d3541..edbeb1f72ea 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
@@ -40,6 +40,11 @@ void QWaylandClientExtensionPrivate::globalRemoved(const RegistryGlobal &global)
     }
 }
 
+/*!
+    \class QWaylandClientExtension
+    \internal
+*/
+
 void QWaylandClientExtension::initialize()
 {
     Q_D(QWaylandClientExtension);
diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
index 0ccc4dba57a..5ab285ad97d 100644
--- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
@@ -192,10 +192,12 @@ void QWaylandInputContext::setFocusObject(QObject *object)
     if (window && window->handle()) {
         if (mCurrentWindow.data() != window) {
             if (!inputMethodAccepted()) {
-                auto *surface = static_cast<QWaylandWindow *>(window->handle())->wlSurface();
-                if (surface)
-                    inputInterface->disableSurface(surface);
-                mCurrentWindow.clear();
+                if (mCurrentWindow) {
+                    auto *surface = static_cast<QWaylandWindow *>(mCurrentWindow->handle())->wlSurface();
+                    if (surface)
+                        inputInterface->disableSurface(surface);
+                    mCurrentWindow.clear();
+                }
             } else {
                 auto *surface = static_cast<QWaylandWindow *>(window->handle())->wlSurface();
                 if (surface) {