diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 10:57:54 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 11:28:38 +0200 |
| commit | 6f65a55fa9a5bf8a547dff2893d49ab405a16af0 (patch) | |
| tree | 971efee66ddcb83afd0f664a6dfa4747436619de /src/widgets/kernel/qwidget.cpp | |
| parent | 1b1831500142c995137f5e4b1bc03d21aa08e1e1 (diff) | |
Rename ImMicroFocus to ImCursorRectangle
Also set ImhMultiLine on QTextEdit
Change-Id: I04a5a1d69c2048ea94c24210e2b8374f334be1b6
Reviewed-on: http://codereview.qt-project.org/4414
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 0cecce8cfb..125e33f0da 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -8338,7 +8338,7 @@ bool QWidget::event(QEvent *event) if (!k->isAccepted() && k->modifiers() & Qt::ShiftModifier && k->key() == Qt::Key_F1 && d->whatsThis.size()) { - QWhatsThis::showText(mapToGlobal(inputMethodQuery(Qt::ImMicroFocus).toRect().center()), d->whatsThis, this); + QWhatsThis::showText(mapToGlobal(inputMethodQuery(Qt::ImCursorRectangle).toRect().center()), d->whatsThis, this); k->accept(); } #endif @@ -9280,7 +9280,7 @@ void QWidget::inputMethodEvent(QInputMethodEvent *event) QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const { switch(query) { - case Qt::ImMicroFocus: + case Qt::ImCursorRectangle: return QRect(width()/2, 0, 1, height()); case Qt::ImFont: return font(); |