diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-01 09:43:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 11:01:34 +0100 |
| commit | c802a5d272cde1f18a8debfb50b02ab1c682c2fc (patch) | |
| tree | 995138a95baa7a285d5912f6bd9fe8c24f38a405 /src/widgets/kernel/qapplication.cpp | |
| parent | 0160f58d4ba5efd3beacaca3ce122554a90f1eb4 (diff) | |
Remove QInputContext
This has only been around as compatibility interface for Qt4
but is now replaced by QPlatformInputContext.
Change-Id: I677dbbea46311bf39f6c5ca9dc3fb5009abe924a
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index c23622ac78..ae15c9f62a 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -71,7 +71,6 @@ #include <QtGui/qstylehints.h> #include <QtGui/qinputmethod.h> -#include "qinputcontext.h" #include "private/qkeymapper_p.h" #ifdef Q_WS_X11 @@ -141,8 +140,6 @@ Q_CORE_EXPORT void qt_call_post_routines(); QApplicationPrivate *QApplicationPrivate::self = 0; -QInputContext *QApplicationPrivate::inputContext = 0; - #ifdef Q_WS_WINCE int QApplicationPrivate::autoMaximizeThreshold = -1; bool QApplicationPrivate::autoSipEnabled = false; @@ -4847,41 +4844,6 @@ int QApplication::keyboardInputInterval() \sa QCoreApplication::instance() */ -#ifndef QT_NO_IM -// ************************************************************************ -// Input Method support -// ************************************************************************ - -/* - This function replaces the QInputContext instance used by the application - with \a inputContext. - - Qt takes ownership of the given \a inputContext. -*/ -void QApplicationPrivate::setInputContext(QInputContext *newInputContext) -{ - Q_Q(QApplication); - - if (newInputContext == inputContext) - return; - if (!newInputContext) { - qWarning("QApplicationPrivate::setInputContext: called with 0 input context"); - return; - } - delete inputContext; - inputContext = newInputContext; - inputContext->setParent(q); -} - -/*! - Returns the QInputContext instance used by the application. -*/ -QInputContext *QApplication::inputContext() const -{ - return QApplicationPrivate::inputContext; -} -#endif // QT_NO_IM - /*! \since 4.2 \obsolete |