diff options
Diffstat (limited to 'src/gui/kernel/qinputmethod.cpp')
| -rw-r--r-- | src/gui/kernel/qinputmethod.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp index ea1978b5fb..175450f890 100644 --- a/src/gui/kernel/qinputmethod.cpp +++ b/src/gui/kernel/qinputmethod.cpp @@ -4,7 +4,6 @@ #include <qinputmethod.h> #include <private/qinputmethod_p.h> #include <qguiapplication.h> -#include <qtimer.h> #include <qpa/qplatforminputcontext_p.h> #include <QDebug> @@ -399,7 +398,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); |