1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp
index ea1978b5fb..e37e85e246 100644
--- a/src/gui/kernel/qinputmethod.cpp
+++ b/src/gui/kernel/qinputmethod.cpp
@@ -399,7 +399,11 @@ QVariant QInputMethod::queryFocusObject(Qt::InputMethodQuery query, const QVaria
                                                         Q_ARG(Qt::InputMethodQuery, query),
                                                         Q_ARG(QVariant, argument));
         Q_ASSERT(ok);
-        return retval;
+        if (retval.isValid())
+            return retval;
+
+        // If the new API didn't have an answer to the query, we fall
+        // back to use the old event-based API.
     }
 
     QInputMethodQueryEvent queryEvent(query);