Ported use of QInputContext to QPlatformInputContext for now

Change-Id: I2e0e62cffd04c3a096d1402028a9be92d8b0a27c
Reviewed-on: http://codereview.qt.nokia.com/2677
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp
index d55bdc8924..405540d419 100644
--- a/src/declarative/items/qsgtextinput.cpp
+++ b/src/declarative/items/qsgtextinput.cpp
@@ -1056,9 +1056,8 @@ void QSGTextInput::moveCursorSelection(int pos, SelectionMode mode)
 
 void QSGTextInput::openSoftwareInputPanel()
 {
-    QEvent event(QEvent::RequestSoftwareInputPanel);
     if (qApp) {
-        if (canvas() && canvas() == QGuiApplication::activeWindow()) {
+        if (canvas()) {
             QEvent event(QEvent::RequestSoftwareInputPanel);
             QApplication::sendEvent(canvas(), &event);
         }
@@ -1068,11 +1067,9 @@ void QSGTextInput::openSoftwareInputPanel()
 void QSGTextInput::closeSoftwareInputPanel()
 {
     if (qApp) {
-        if (canvas() && canvas() == QGuiApplication::activeWindow()) {
-            // ### refactor: port properly
-            qDebug("QSGTextInput: closing virtual keyboard not implemented");
-//            QEvent event(QEvent::CloseSoftwareInputPanel);
-//            QApplication::sendEvent(canvas(), &event);
+        if (canvas()) {
+            QEvent event(QEvent::CloseSoftwareInputPanel);
+            QApplication::sendEvent(canvas(), &event);
         }
     }
 }