3 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp
index 6e4e5a9c93..11442407e1 100644
--- a/src/gui/kernel/qinputdevicemanager.cpp
+++ b/src/gui/kernel/qinputdevicemanager.cpp
@@ -75,13 +75,13 @@ int QInputDeviceManager::deviceCount(DeviceType type) const
 
 int QInputDeviceManagerPrivate::deviceCount(QInputDeviceManager::DeviceType type) const
 {
-    return m_deviceCount.value(type);
+    return m_deviceCount[type];
 }
 
 void QInputDeviceManagerPrivate::setDeviceCount(QInputDeviceManager::DeviceType type, int count)
 {
     Q_Q(QInputDeviceManager);
-    if (m_deviceCount.value(type) != count) {
+    if (m_deviceCount[type] != count) {
         m_deviceCount[type] = count;
         emit q->deviceListChanged(type);
     }
diff --git a/src/gui/kernel/qinputdevicemanager_p.h b/src/gui/kernel/qinputdevicemanager_p.h
index 74494d712b..1d20b102e3 100644
--- a/src/gui/kernel/qinputdevicemanager_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p.h
@@ -69,7 +69,9 @@ public:
         DeviceTypePointer,
         DeviceTypeKeyboard,
         DeviceTypeTouch,
-        DeviceTypeTablet
+        DeviceTypeTablet,
+
+        NumDeviceTypes
     };
 
     QInputDeviceManager(QObject *parent = nullptr);
diff --git a/src/gui/kernel/qinputdevicemanager_p_p.h b/src/gui/kernel/qinputdevicemanager_p_p.h
index 0a91252fbc..871f9315c3 100644
--- a/src/gui/kernel/qinputdevicemanager_p_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p_p.h
@@ -52,10 +52,11 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include <QtCore/qmap.h>
 #include <private/qobject_p.h>
 #include "qinputdevicemanager_p.h"
 
+#include <array>
+
 QT_BEGIN_NAMESPACE
 
 class Q_GUI_EXPORT QInputDeviceManagerPrivate : public QObjectPrivate
@@ -68,7 +69,7 @@ public:
     int deviceCount(QInputDeviceManager::DeviceType type) const;
     void setDeviceCount(QInputDeviceManager::DeviceType type, int count);
 
-    QMap<QInputDeviceManager::DeviceType, int> m_deviceCount;
+    std::array<int, QInputDeviceManager::NumDeviceTypes> m_deviceCount;
 
     Qt::KeyboardModifiers keyboardModifiers;
 };