1 files changed, 24 insertions, 0 deletions
diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 06c95d4d..cc8b9ef8 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -197,6 +197,8 @@ void InputContext::setShift(bool enable)
     if (d->shift != enable) {
         d->shift = enable;
         emit shiftChanged();
+        if (!d->capsLock)
+            emit uppercaseChanged();
     }
 }
 
@@ -212,9 +214,17 @@ void InputContext::setCapsLock(bool enable)
     if (d->capsLock != enable) {
         d->capsLock = enable;
         emit capsLockChanged();
+        if (!d->shift)
+            emit uppercaseChanged();
     }
 }
 
+bool InputContext::uppercase() const
+{
+    Q_D(const InputContext);
+    return d->shift || d->capsLock;
+}
+
 int InputContext::cursorPosition() const
 {
     Q_D(const InputContext);
@@ -844,6 +854,20 @@ bool InputContext::filterEvent(const QEvent *event)
 */
 
 /*!
+    \qmlproperty bool InputContext::uppercase
+    \since QtQuick.VirtualKeyboard 2.2
+
+    This property is \c true when either \l shift or \l capsLock is \c true.
+*/
+
+/*!
+    \property QtVirtualKeyboard::InputContext::uppercase
+    \brief the uppercase status.
+
+    This property is \c true when either \l shift or \l capsLock is \c true.
+*/
+
+/*!
     \qmlproperty int InputContext::cursorPosition
 
     This property is changed when the cursor position changes.