1 files changed, 14 insertions, 16 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 3f2e4728ed..1dd774cf7a 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -1727,24 +1727,22 @@ QVariant QTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
 QVariant QTextEdit::inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const
 {
     Q_D(const QTextEdit);
-    QVariant v;
-    switch (query) {
-    case Qt::ImHints:
-        v = QWidget::inputMethodQuery(query);
-        break;
+    if (query == Qt::ImHints)
+        return QWidget::inputMethodQuery(query);
+    const QVariant v = d->control->inputMethodQuery(query, argument);
+    const QPointF offset(-d->horizontalOffset(), -d->verticalOffset());
+    switch (v.type()) {
+    case QVariant::RectF:
+        return v.toRectF().translated(offset);
+    case QVariant::PointF:
+        return v.toPointF() + offset;
+    case QVariant::Rect:
+        return v.toRect().translated(offset.toPoint());
+    case QVariant::Point:
+        return v.toPoint() + offset.toPoint();
     default:
-        v = d->control->inputMethodQuery(query, argument);
-        const QPoint offset(-d->horizontalOffset(), -d->verticalOffset());
-        if (v.type() == QVariant::RectF)
-            v = v.toRectF().toRect().translated(offset);
-        else if (v.type() == QVariant::PointF)
-            v = v.toPointF().toPoint() + offset;
-        else if (v.type() == QVariant::Rect)
-            v = v.toRect().translated(offset);
-        else if (v.type() == QVariant::Point)
-            v = v.toPoint() + offset;
+        break;
     }
-
     return v;
 }