From 6ec4a1fb6208d9c5d93ac0e5574d5a85440523e7 Mon Sep 17 00:00:00 2001
From: Robert Griebl <robert.griebl@qt.io>
Date: Tue, 24 May 2022 14:13:51 +0200
Subject: [PATCH] Use Qt's text-input protocol by default.

Change-Id: I9ea1871c71f30fbc265d1aa471c3e050d98347e0
---
 src/window-lib/waylandcompositor.cpp | 6 +++---
 src/window-lib/waylandcompositor.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp
index 540fd048..8c6f6c07 100644
--- a/src/window-lib/waylandcompositor.cpp
+++ b/src/window-lib/waylandcompositor.cpp
@@ -48,7 +48,7 @@
 #  include <private/qwaylandxdgshell_p.h>
 #endif
 #include <QWaylandQuickOutput>
-#include <QWaylandTextInputManager>
+#include <QWaylandQtTextInputMethodManager>
 #include <QWaylandQtWindowManager>
 #include "waylandqtamserverextension_p.h"
 
@@ -152,12 +152,12 @@ WaylandCompositor::WaylandCompositor(QQuickWindow *window, const QString &waylan
     , m_wlShell(new QWaylandWlShell(this))
     , m_xdgShell(new QWaylandXdgShell(this))
     , m_amExtension(new WaylandQtAMServerExtension(this))
-    , m_textInputManager(new QWaylandTextInputManager(this))
+    , m_qtTextInputMethodManager(new QWaylandQtTextInputMethodManager(this))
 {
     m_wlShell->setParent(this);
     m_xdgShell->setParent(this);
     m_amExtension->setParent(this);
-    m_textInputManager->setParent(this);
+    m_qtTextInputMethodManager->setParent(this);
 
     setSocketName(waylandSocketName.toUtf8());
     registerOutputWindow(window);
diff --git a/src/window-lib/waylandcompositor.h b/src/window-lib/waylandcompositor.h
index d97f8cae..7437329b 100644
--- a/src/window-lib/waylandcompositor.h
+++ b/src/window-lib/waylandcompositor.h
@@ -47,7 +47,7 @@
 QT_FORWARD_DECLARE_CLASS(QWaylandResource)
 QT_FORWARD_DECLARE_CLASS(QWaylandWlShell)
 QT_FORWARD_DECLARE_CLASS(QWaylandWlShellSurface)
-QT_FORWARD_DECLARE_CLASS(QWaylandTextInputManager)
+QT_FORWARD_DECLARE_CLASS(QWaylandQtTextInputMethodManager)
 
 QT_FORWARD_DECLARE_CLASS(QWaylandXdgShell)
 QT_FORWARD_DECLARE_CLASS(QWaylandXdgSurface)
@@ -140,7 +140,7 @@ protected:
     QWaylandXdgShell *m_xdgShell;
     QVector<QWaylandOutput *> m_outputs;
     WaylandQtAMServerExtension *m_amExtension;
-    QWaylandTextInputManager *m_textInputManager;
+    QWaylandQtTextInputMethodManager *m_qtTextInputMethodManager;
     QMap<uint, QPointer<WindowSurface>> m_xdgPingMap;
 };
 
-- 
2.36.1