diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-03 10:07:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 09:54:58 +0100 |
| commit | e761f5b906c427433325debb9f08c4f2d0ba902d (patch) | |
| tree | fa8fbc933b6ed9ea2cdbc918d4317c95992c26e7 /src/quick/items/qquicktextedit.cpp | |
| parent | 9634dc440269fc03f825a6d18b371d8e612ba9ec (diff) | |
Use QInputMethod instead of deprecated QInputPanel
Similarly deprecate Qt.application.inputPanel and
introduce replacement Qt.inputMethod.
Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 85480cf558..5343715c3a 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -560,7 +560,7 @@ bool QQuickTextEditPrivate::determineHorizontalAlignment() if (document->isEmpty()) { const QString preeditText = control->textCursor().block().layout()->preeditAreaText(); alignToRight = preeditText.isEmpty() - ? qApp->inputPanel()->inputDirection() == Qt::RightToLeft + ? qApp->inputMethod()->inputDirection() == Qt::RightToLeft : preeditText.isRightToLeft(); } else { alignToRight = rightToLeftText; @@ -1545,10 +1545,10 @@ void QQuickTextEdit::itemChange(ItemChange change, const ItemChangeData &value) if (value.boolValue) { q_updateAlignment(); - connect(qApp->inputPanel(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + connect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), this, SLOT(q_updateAlignment())); } else { - disconnect(qApp->inputPanel(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + disconnect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), this, SLOT(q_updateAlignment())); } } @@ -2099,7 +2099,7 @@ void QQuickTextEditPrivate::updateDefaultTextOption() void QQuickTextEdit::openSoftwareInputPanel() { if (qGuiApp) - qGuiApp->inputPanel()->show(); + qGuiApp->inputMethod()->show(); } /*! @@ -2142,7 +2142,7 @@ void QQuickTextEdit::openSoftwareInputPanel() void QQuickTextEdit::closeSoftwareInputPanel() { if (qGuiApp) - qGuiApp->inputPanel()->hide(); + qGuiApp->inputMethod()->hide(); } void QQuickTextEdit::focusInEvent(QFocusEvent *event) |