diff options
| -rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 13 | ||||
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 12 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 4dc30d6542..5b6a413b40 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -68,10 +68,6 @@ #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif -#ifndef QT_NO_IM -#include "qinputcontext.h" -#include "qlist.h" -#endif #include "qabstractitemview.h" #include "private/qstylesheetstyle_p.h" @@ -2062,15 +2058,6 @@ QMenu *QLineEdit::createStandardContextMenu() d->selectAllAction = action; connect(action, SIGNAL(triggered()), SLOT(selectAll())); -#if !defined(QT_NO_IM) - QInputContext *qic = inputContext(); - if (qic) { - QList<QAction *> imActions = qic->actions(); - for (int i = 0; i < imActions.size(); ++i) - popup->addAction(imActions.at(i)); - } -#endif - #if defined(Q_WS_WIN) || defined(Q_WS_X11) if (!d->control->isReadOnly() && qt_use_rtl_extensions) { #else diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index e2be1cb2bf..3aaeae50d2 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -75,7 +75,6 @@ #include <qvariant.h> #include <qurl.h> #include <qdesktopservices.h> -#include <qinputcontext.h> #include <qinputpanel.h> #include <qtooltip.h> #include <qstyleoption.h> @@ -2167,17 +2166,6 @@ QMenu *QWidgetTextControl::createStandardContextMenu(const QPointF &pos, QWidget a->setEnabled(!d->doc->isEmpty()); } -#if !defined(QT_NO_IM) - if (d->contextWidget) { - QInputContext *qic = qApp->inputContext(); - if (qic) { - QList<QAction *> imActions = qic->actions(); - for (int i = 0; i < imActions.size(); ++i) - menu->addAction(imActions.at(i)); - } - } -#endif - #if defined(Q_WS_WIN) || defined(Q_WS_X11) if ((d->interactionFlags & Qt::TextEditable) && qt_use_rtl_extensions) { #else |