From 3a905552e43199b0a1124717cbd7c1eccd601807 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 7 Feb 2012 10:07:38 +1000
Subject: Fix compile failures due to the removal of QInputContext.

The class was unused but still included by a couple of files.

Change-Id: I8172be02d6185b44cf37d28220b99a1a206c95a0
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp                | 1 -
 .../declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 8cb28680..40e9deb4 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -53,7 +53,6 @@
 #include <QFontMetrics>
 #include <QPainter>
 #include <QTextBoundaryFinder>
-#include <QInputContext>
 #include <qstyle.h>
 
 #ifndef QT_NO_LINEEDIT
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 52ae21c8..684fda63 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -49,7 +49,6 @@
 #include <QDebug>
 #include <QDir>
 #include <QStyle>
-#include <QInputContext>
 #include <private/qapplication_p.h>
 #include <private/qinputpanel_p.h>
 #include <private/qwidgetlinecontrol_p.h>
@@ -2318,7 +2317,6 @@ void tst_qdeclarativetextinput::openInputPanelOnFocus()
     // if TextInput loses focus
     input.setFocus(false);
     QApplication::processEvents();
-    QVERIFY(view.inputContext() == 0);
     QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
 
     // input method should not be enabled
@@ -2328,7 +2326,6 @@ void tst_qdeclarativetextinput::openInputPanelOnFocus()
     input.setFocus(true);
     QApplication::processEvents();
     QCOMPARE(ic.isInputPanelVisible(), false);
-    QVERIFY(view.inputContext() == 0);
     QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
 }
 
-- 
cgit v1.2.3