From ab061e3e436fab35eac8666f3e950e98f66c4d3e Mon Sep 17 00:00:00 2001
From: Matthew Cattell <matthew.cattell@nokia.com>
Date: Wed, 28 Sep 2011 13:52:59 +0200
Subject: reimplemented doUpdateMicroFocus to work without calling the base
 implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic96ab2bb93248e6d3ba1c8b789ed3c21f8ad39bd
Reviewed-on: http://codereview.qt-project.org/5716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
---
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'tests/auto')

diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 2d629176f3..ce099e0de9 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -10393,7 +10393,17 @@ public:
 
     void doUpdateMicroFocus()
     {
-        updateMicroFocus();
+        if (QWidget *fw = QApplication::focusWidget()) {
+            if (scene()) {
+                for (int i = 0 ; i < scene()->views().count() ; ++i) {
+                    if (scene()->views().at(i) == fw) {
+                        if (QInputContext *inputContext = fw->inputContext()) {
+                            inputContext->update();
+                        }
+                    }
+                }
+            }
+        }
     }
 };
 
-- 
cgit v1.2.3