diff --git a/src/plugins/fakevim/CMakeLists.txt b/src/plugins/fakevim/CMakeLists.txt
index b9bd8362ebe..ddb6f3c1f1e 100644
--- a/src/plugins/fakevim/CMakeLists.txt
+++ b/src/plugins/fakevim/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_qtc_plugin(FakeVim
-  CONDITION Qt5_VERSION VERSION_LESS 6.0.0
   PLUGIN_DEPENDS Core TextEditor
   PLUGIN_TEST_DEPENDS CppEditor CppTools
   SOURCES ${TEST_SOURCES}
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 9526fb78377..a00d43a6fe8 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -1300,6 +1300,11 @@ public:
             << quoteUnprintable(m_text);
     }
 
+    friend uint qHash(const Input &i)
+    {
+        return ::qHash(i.m_key);
+    }
+
 private:
     int m_key = 0;
     int m_xkey = 0;
@@ -1645,7 +1650,7 @@ private:
 };
 
 // Mappings for a specific mode (trie structure)
-class ModeMapping : public QMap<Input, ModeMapping>
+class ModeMapping : public QHash<Input, ModeMapping>
 {
 public:
     const Inputs &value() const { return m_value; }