Move keyboardInput data back to QApplication

Deprecated interface, rest of Qt now adapted to
QInputPanel.

Change-Id: Iacbbcac90dd7c037a24b45df1ee868f04090b21b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>

2 files changed, 0 insertions, 25 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f92e66b38e..c89e144c84 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1521,28 +1521,6 @@ uint QGuiApplicationPrivate::currentKeyPlatform()
 }
 
 /*!
-    \since 4.2
-    \obsolete
-
-    Returns the current keyboard input locale. Replaced with QInputPanel::locale()
-*/
-QLocale QGuiApplication::keyboardInputLocale()
-{
-    return qApp ? qApp->inputPanel()->locale() : QLocale::c();
-}
-
-/*!
-    \since 4.2
-    \obsolete
-
-    Returns the current keyboard input direction. Replaced with QInputPanel::inputDirection()
-*/
-Qt::LayoutDirection QGuiApplication::keyboardInputDirection()
-{
-    return qApp ? qApp->inputPanel()->inputDirection() : Qt::LeftToRight;
-}
-
-/*!
     \since 4.5
     \fn void QGuiApplication::fontDatabaseChanged()
 
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index dd7b1f8806..a07e13332e 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -119,9 +119,6 @@ public:
     static inline bool isRightToLeft() { return layoutDirection() == Qt::RightToLeft; }
     static inline bool isLeftToRight() { return layoutDirection() == Qt::LeftToRight; }
 
-    QT_DEPRECATED static QLocale keyboardInputLocale();
-    QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection();
-
     QStyleHints *styleHints() const;
     QInputPanel *inputPanel() const;