Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

1 files changed, 4 insertions, 2 deletions

diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
index 01b7e9fc0e..d91da330c3 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
@@ -53,6 +53,7 @@
 
 #include "qevdevkeyboardhandler_p.h"
 
+#include <QtInputSupport/private/devicehandlerlist_p.h>
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 
 #include <QObject>
@@ -74,9 +75,10 @@ public:
     void removeKeyboard(const QString &deviceNode);
 
 private:
+    void updateDeviceCount();
+
     QString m_spec;
-    QHash<QString,QEvdevKeyboardHandler*> m_keyboards;
-    QDeviceDiscovery *m_deviceDiscovery;
+    QtInputSupport::DeviceHandlerList<QEvdevKeyboardHandler> m_keyboards;
     QString m_defaultKeymapFile;
 };