From ba62482f69385ba929384e0402135891c77eddcb Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Wed, 12 Aug 2009 09:44:51 +0200
Subject: Revert "Changed the behavior of ImCursorPosition slightly."

This reverts commit ce02d0e9e0ad8d8ac47e4f3ee95bac5cb74ed184.

This turned out not to be enough for proper selection support
together with S60 FEP. Instead we will revert the behavior and add
new API.
(cherry picked from commit 6545932efa45ea2b8fbc1459d760ec5f15c63120)

Conflicts:

	doc/src/qnamespace.qdoc
	src/gui/widgets/qlineedit.cpp
---
 src/gui/widgets/qlineedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index 5b04616..cd9666d 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -1657,7 +1657,7 @@ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
     case Qt::ImFont:
         return font();
     case Qt::ImCursorPosition:
-        return QVariant(d->control->hasSelectedText() ? d->control->selectionEnd() : d->control->cursor());
+        return QVariant(d->control->cursor());
     case Qt::ImSurroundingText:
         return QVariant(text());
     case Qt::ImCurrentSelection:
-- 
cgit v0.12