diff options
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 628848b0d7..96389b8333 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -75,7 +75,7 @@ #include <qvariant.h> #include <qurl.h> #include <qdesktopservices.h> -#include <qinputpanel.h> +#include <qinputmethod.h> #include <qtooltip.h> #include <qstyleoption.h> #include <QtWidgets/qlineedit.h> @@ -1689,7 +1689,7 @@ void QWidgetTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button _q_updateCurrentCharFormatAndSelection(); #ifndef QT_NO_IM if (contextWidget) - qApp->inputPanel()->update(Qt::ImQueryInput); + qApp->inputMethod()->update(Qt::ImQueryInput); #endif //QT_NO_IM } else { //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1))); @@ -1836,7 +1836,7 @@ bool QWidgetTextControlPrivate::sendMouseEventToInputContext( if (cursorPos >= 0) { if (e->type() == QEvent::MouseButtonRelease) - qApp->inputPanel()->invokeAction(QInputPanel::Click, cursorPos); + qApp->inputMethod()->invokeAction(QInputMethod::Click, cursorPos); e->setAccepted(true); return true; @@ -2755,7 +2755,7 @@ void QWidgetTextControlPrivate::commitPreedit() return; cursor.beginEditBlock(); - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); if (!tentativeCommit.isEmpty()) { cursor.insertText(tentativeCommit); |