3 files changed, 3 insertions, 38 deletions
diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index b5405e3a54..d41f0bfdf3 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -23,8 +23,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a new key mapper.
 */
-QKeyMapper::QKeyMapper()
-    : QObject(*new QKeyMapperPrivate, nullptr)
+QKeyMapper::QKeyMapper() : QObject()
 {
 }
 
@@ -73,21 +72,6 @@ QKeyMapper *QKeyMapper::instance()
     return keymapper();
 }
 
-QKeyMapperPrivate *qt_keymapper_private()
-{
-    return QKeyMapper::instance()->d_func();
-}
-
-QKeyMapperPrivate::QKeyMapperPrivate()
-{
-    keyboardInputLocale = QLocale::system();
-    keyboardInputDirection = keyboardInputLocale.textDirection();
-}
-
-QKeyMapperPrivate::~QKeyMapperPrivate()
-{
-}
-
 void *QKeyMapper::resolveInterface(const char *name, int revision) const
 {
     Q_UNUSED(name); Q_UNUSED(revision);
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 6c9ea2f22c..2c36bcc5c5 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -25,7 +25,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QKeyMapperPrivate;
 class Q_GUI_EXPORT QKeyMapper : public QObject
 {
     Q_OBJECT
@@ -40,27 +39,9 @@ public:
     QT_DECLARE_NATIVE_INTERFACE_ACCESSOR(QKeyMapper)
 
 private:
-    friend QKeyMapperPrivate *qt_keymapper_private();
-    Q_DECLARE_PRIVATE(QKeyMapper)
     Q_DISABLE_COPY_MOVE(QKeyMapper)
 };
 
-struct KeyboardLayoutItem;
-class QKeyEvent;
-
-class QKeyMapperPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QKeyMapper)
-public:
-    QKeyMapperPrivate();
-    ~QKeyMapperPrivate();
-
-    QLocale keyboardInputLocale;
-    Qt::LayoutDirection keyboardInputDirection;
-};
-
-QKeyMapperPrivate *qt_keymapper_private(); // from qkeymapper.cpp
-
 // ----------------- QNativeInterface -----------------
 
 namespace QNativeInterface::Private {
diff --git a/src/gui/kernel/qplatforminputcontext.cpp b/src/gui/kernel/qplatforminputcontext.cpp
index 985cefa12c..4cf7acea2e 100644
--- a/src/gui/kernel/qplatforminputcontext.cpp
+++ b/src/gui/kernel/qplatforminputcontext.cpp
@@ -192,7 +192,7 @@ void QPlatformInputContext::emitInputPanelVisibleChanged()
 
 QLocale QPlatformInputContext::locale() const
 {
-    return qt_keymapper_private()->keyboardInputLocale;
+    return QLocale::system();
 }
 
 void QPlatformInputContext::emitLocaleChanged()
@@ -202,7 +202,7 @@ void QPlatformInputContext::emitLocaleChanged()
 
 Qt::LayoutDirection QPlatformInputContext::inputDirection() const
 {
-    return qt_keymapper_private()->keyboardInputDirection;
+    return locale().textDirection();
 }
 
 void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDirection)