summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>2012-04-13 15:09:30 -0700
committerQt by Nokia <qt-info@nokia.com>2012-04-14 15:24:47 +0200
commit6d8f3821a2ff621a3f34074399864b6d75daf654 (patch)
tree307a46d04b14f14ab6431a3faa10e064cd029add /src
parente600b482251ccf9caf2058f3b31e1516fde54b28 (diff)
QInputPanel has been renamed to QInputMethod
QGuiApplication::inputPanel will be removed. Change-Id: I8c9a994777301c30f234e0b23816c12ec27c7a0f Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index ba0878db..4987818a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1229,7 +1229,7 @@ bool QDeclarativeTextInputPrivate::sendMouseEventToInputContext(
int mousePos = tmp_cursor - control->cursor();
if (mousePos >= 0 && mousePos <= control->preeditAreaText().length()) {
if (eventType == QEvent::MouseButtonRelease) {
- qApp->inputMethod()->invokeAction(QInputPanel::Click, mousePos);
+ qApp->inputMethod()->invokeAction(QInputMethod::Click, mousePos);
}
return true;
}
@@ -1757,7 +1757,7 @@ void QDeclarativeTextInput::openSoftwareInputPanel()
if (qApp) {
if (QGraphicsView * view = qobject_cast<QGraphicsView*>(qApp->focusWidget())) {
if (view->scene() && view->scene() == scene()) {
- qApp->inputPanel()->show();
+ qApp->inputMethod()->show();
}
}
}
@@ -1806,7 +1806,7 @@ void QDeclarativeTextInput::closeSoftwareInputPanel()
if (qApp) {
if (QGraphicsView * view = qobject_cast<QGraphicsView*>(qApp->focusWidget())) {
if (view->scene() && view->scene() == scene()) {
- qApp->inputPanel()->hide();
+ qApp->inputMethod()->hide();
}
}
}