Merge pull request #1248 from deXol/develop

Fix build issue for Keyboard Layout Detector <6.0 Qt version
mooltipass · Dec 9, 2024 · 3311b88 · 3311b88
2 parents 5c2cf87 + 94990a2
commit 3311b88
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/utils/KeyboardLayoutDetectorUnix.cpp b/src/utils/KeyboardLayoutDetectorUnix.cpp
@@ -74,11 +74,18 @@ QString KeyboardLayoutDetectorUnix::getKeyboardLayout()
     if (!out.isEmpty())
     {
         const RegExp rx(RESULT_REGEXP);
+#if QT_VERSION < 0x060000
+        if (rx.indexIn(out) != -1)
+        {
+            return rx.cap(1);
+        }
+#else
         auto match = rx.match(out);
         if (match.hasMatch())
         {
             return match.captured(1);
         }
+#endif
     }
 
     qWarning() << "Keyboard layout was not fetched successfully";