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_qpa.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_qpa.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication_qpa.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index e3429dc17c..e221df7ef7 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -54,7 +54,6 @@ #include "private/qplatformintegrationfactory_qpa_p.h" #include <qdesktopwidget.h> -#include <qinputcontext.h> #include <QPlatformCursor> #include <qdebug.h> #include <QWindowSystemInterface> @@ -395,10 +394,6 @@ void qt_init(QApplicationPrivate *priv, int type) QColormap::initialize(); qApp->setObjectName(appName); - -#ifndef QT_NO_QWS_INPUTMETHODS - priv->setInputContext(new QInputContext(qApp)); -#endif } #ifdef Q_OS_WIN @@ -418,8 +413,6 @@ void qt_cleanup() { QPixmapCache::clear(); QColormap::cleanup(); - delete QApplicationPrivate::inputContext; - QApplicationPrivate::inputContext = 0; QApplicationPrivate::active_window = 0; //### this should not be necessary #ifdef Q_OS_WIN |