Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5a49f9e755d85ea160fcf2ccfbc691ce0c17b458

1 files changed, 5 insertions, 3 deletions

diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp
index e9bb389d6..3641bdc88 100644
--- a/src/kmap2qmap/main.cpp
+++ b/src/kmap2qmap/main.cpp
@@ -395,9 +395,11 @@ static const int symbol_synonyms_size = sizeof(symbol_synonyms)/sizeof(symbol_sy
 
 // makes the generated array in --header mode a bit more human readable
 QT_BEGIN_NAMESPACE
-static bool operator<(const QEvdevKeyboardMap::Mapping &m1, const QEvdevKeyboardMap::Mapping &m2)
-{
-    return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
+namespace QEvdevKeyboardMap {
+    static bool operator<(const Mapping &m1, const Mapping &m2)
+    {
+        return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
+    }
 }
 QT_END_NAMESPACE