Support TextInput V3 over v4-wip

Support for v4-wip was not added into any desktop linux compositors, nor
was it ever enabled into the default Qt client builds for clients or
compositor.

TextInputV3 has become the most widely deployed. Whilst changes are
needed, they do not need to be breaking changes. A second iteration of
V3 can add the features we need. This is now in motion upstream.

For cases where QtWaylandCompositor is used, the custom Qt text input
method is preferred to work with the Qt virtual keyboard.

Pick-to: 6.7
Change-Id: I01e2686c67846804c0069f1495952b530547f91c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol_p.h b/src/compositor/compositor_api/qwaylandinputmethodcontrol_p.h
index 9f9fc3949..36a0db0c4 100644
--- a/src/compositor/compositor_api/qwaylandinputmethodcontrol_p.h
+++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol_p.h
@@ -26,9 +26,7 @@ class QWaylandCompositor;
 class QWaylandSeat;
 class QWaylandSurface;
 class QWaylandTextInput;
-#if QT_WAYLAND_TEXT_INPUT_V4_WIP
-class QWaylandTextInputV4;
-#endif // QT_WAYLAND_TEXT_INPUT_V4_WIP
+class QWaylandTextInputV3;
 class QWaylandQtTextInputMethod;
 
 class Q_WAYLANDCOMPOSITOR_EXPORT QWaylandInputMethodControlPrivate : public QObjectPrivate
@@ -39,9 +37,7 @@ public:
     explicit QWaylandInputMethodControlPrivate(QWaylandSurface *surface);
 
     QWaylandTextInput *textInput() const;
-#if QT_WAYLAND_TEXT_INPUT_V4_WIP
-    QWaylandTextInputV4 *textInputV4() const;
-#endif // QT_WAYLAND_TEXT_INPUT_V4_WIP
+    QWaylandTextInputV3 *textInputV3() const;
     QWaylandQtTextInputMethod *textInputMethod() const;
 
     QWaylandCompositor *compositor = nullptr;