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/widgets/qscrollarea.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/widgets/qscrollarea.cpp')
-rw-r--r-- | src/widgets/widgets/qscrollarea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp index 314f4fe9d2..5d03c07472 100644 --- a/src/widgets/widgets/qscrollarea.cpp +++ b/src/widgets/widgets/qscrollarea.cpp @@ -465,9 +465,9 @@ void QScrollArea::ensureWidgetVisible(QWidget *childWidget, int xmargin, int yma if (!d->widget->isAncestorOf(childWidget)) return; - const QRect microFocus = childWidget->inputMethodQuery(Qt::ImMicroFocus).toRect(); + const QRect microFocus = childWidget->inputMethodQuery(Qt::ImCursorRectangle).toRect(); const QRect defaultMicroFocus = - childWidget->QWidget::inputMethodQuery(Qt::ImMicroFocus).toRect(); + childWidget->QWidget::inputMethodQuery(Qt::ImCursorRectangle).toRect(); QRect focusRect = (microFocus != defaultMicroFocus) ? QRect(childWidget->mapTo(d->widget, microFocus.topLeft()), microFocus.size()) : QRect(childWidget->mapTo(d->widget, QPoint(0,0)), childWidget->size()); |