From 0fa3bbc4c63e84d5902e0950e4fa0559fe1988cf Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Mon, 1 Aug 2022 17:13:59 +0200
Subject: [PATCH] Port to QML RegularExpressionValidator

RegExpValidator is deprecated and gone in Qt6.
---
 kcms/nightcolor/package/contents/ui/TimeField.qml | 4 ++--
 kcms/users/package/contents/ui/CreateUser.qml     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kcms/nightcolor/package/contents/ui/TimeField.qml b/kcms/nightcolor/package/contents/ui/TimeField.qml
index 61859da95..1d3ebdb2e 100644
--- a/kcms/nightcolor/package/contents/ui/TimeField.qml
+++ b/kcms/nightcolor/package/contents/ui/TimeField.qml
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-import QtQuick 2.1
+import QtQuick 2.15
 import QtQuick.Controls 2.5 as QQC2
 
 QQC2.TextField {
@@ -56,7 +56,7 @@ QQC2.TextField {
     inputMask: "00:00"
     selectByMouse: false
     inputMethodHints: Qt.ImhPreferNumbers
-    validator: RegExpValidator { regExp: /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/ }
+    validator: RegularExpressionValidator { regularExpression: /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/ }
 
     onEditingFinished: submit()
 }
diff --git a/kcms/users/package/contents/ui/CreateUser.qml b/kcms/users/package/contents/ui/CreateUser.qml
index ed7ef91ea..8658875f9 100644
--- a/kcms/users/package/contents/ui/CreateUser.qml
+++ b/kcms/users/package/contents/ui/CreateUser.qml
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
-import QtQuick 2.6
+import QtQuick 2.15
 import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.5 as QQC2
@@ -33,8 +33,8 @@ KCM.SimpleKCM {
         QQC2.TextField {
             id: userNameField
             Kirigami.FormData.label: i18n("Username:")
-            validator: RegExpValidator {
-                regExp: /^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\$)$/
+            validator: RegularExpressionValidator {
+                regularExpression: /^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\$)$/
             }
         }
         QQC2.ComboBox {