Restore InputContext.inputItem property removed in 5.12 release

This API was removed in 5.12 release as part of refactoring.

However, based on user reports, it is somewhat used in applications,
though it was originally intended for internal use. This change
brings it back to the public as deprecated.

[ChangeLog][InputContext] Restore InputContext.inputItem property removed in 5.12 release.

Task-number: QTBUG-72494
Change-Id: I1fda2ae3671bf784839f395345dca3402be35d05
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 25 insertions, 0 deletions

diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
index 16238a3b..f1140260 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
@@ -70,6 +70,7 @@ QVirtualKeyboardInputContext::QVirtualKeyboardInputContext(QObject *parent) :
     QObject::connect(d->_shiftHandler, &ShiftHandler::capsLockActiveChanged, this, &QVirtualKeyboardInputContext::capsLockActiveChanged);
     QObject::connect(d->_shiftHandler, &ShiftHandler::uppercaseChanged, this, &QVirtualKeyboardInputContext::uppercaseChanged);
     QObject::connect(d, &QVirtualKeyboardInputContextPrivate::localeChanged, this, &QVirtualKeyboardInputContext::localeChanged);
+    QObject::connect(d, &QVirtualKeyboardInputContextPrivate::inputItemChanged, this, &QVirtualKeyboardInputContext::inputItemChanged);
 }
 
 /*!
@@ -192,6 +193,12 @@ QString QVirtualKeyboardInputContext::locale() const
     return d->locale();
 }
 
+QObject *QVirtualKeyboardInputContext::inputItem() const
+{
+    Q_D(const QVirtualKeyboardInputContext);
+    return d->inputItem();
+}
+
 QVirtualKeyboardInputEngine *QVirtualKeyboardInputContext::inputEngine() const
 {
     Q_D(const QVirtualKeyboardInputContext);
@@ -613,6 +620,21 @@ QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const
 */
 
 /*!
+    \qmlproperty QtObject InputContext::inputItem
+    \deprecated
+
+    This property is changed when the focused input item changes.
+*/
+
+/*!
+    \property QVirtualKeyboardInputContext::inputItem
+    \brief the focused input item.
+    \deprecated
+
+    This property is changed when the focused input item changes.
+*/
+
+/*!
     \qmlproperty InputEngine InputContext::inputEngine
 
     This property stores the input engine.
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
index 58cab483..bac9749c 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
@@ -65,6 +65,7 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject
     Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
     Q_PROPERTY(bool animating READ isAnimating WRITE setAnimating NOTIFY animatingChanged)
     Q_PROPERTY(QString locale READ locale NOTIFY localeChanged)
+    Q_PROPERTY(QObject *inputItem READ inputItem NOTIFY inputItemChanged)
     Q_PROPERTY(QVirtualKeyboardInputEngine *inputEngine READ inputEngine CONSTANT)
     Q_PROPERTY(bool selectionControlVisible READ isSelectionControlVisible NOTIFY selectionControlVisibleChanged)
     Q_PROPERTY(bool anchorRectIntersectsClipRect READ anchorRectIntersectsClipRect NOTIFY anchorRectIntersectsClipRectChanged)
@@ -91,6 +92,7 @@ public:
     bool isAnimating() const;
     void setAnimating(bool isAnimating);
     QString locale() const;
+    QObject *inputItem() const;
     QVirtualKeyboardInputEngine *inputEngine() const;
     bool isSelectionControlVisible() const;
     bool anchorRectIntersectsClipRect() const;
@@ -119,6 +121,7 @@ Q_SIGNALS:
     void uppercaseChanged();
     void animatingChanged();
     void localeChanged();
+    void inputItemChanged();
     void selectionControlVisibleChanged();
     void anchorRectIntersectsClipRectChanged();
     void cursorRectIntersectsClipRectChanged();