Migrate VirtualKeyboardSettings to QRegularExpression

This patch updates the VirtualKeyboardSettings  class to use
QRegularExpression in place of QRegExp which is to be considered
deprecated.

Change-Id: Ib7cecc0070f86b63793e3f3876a44710a0ecc394
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index d73c3f9b..74487ef4 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -33,7 +33,7 @@
 #include <QQmlEngine>
 #include <QFileInfo>
 #include <QDir>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QtCore/private/qobject_p.h>
 
 namespace QtVirtualKeyboard {
@@ -294,8 +294,9 @@ void VirtualKeyboardSettings::resetStyle()
     QString customStyleName = qgetenv("QT_VIRTUALKEYBOARD_STYLE");
     if (!customStyleName.isEmpty()) {
         bool found = false;
-        QRegExp styleNameValidator("\\w+");
-        if (styleNameValidator.exactMatch(customStyleName)) {
+        QRegularExpression styleNameValidator("\\A(?:\\w+)\\z");
+        QRegularExpressionMatch match = styleNameValidator.match(customStyleName);
+        if (match.hasMatch()) {
             QString customStyle = d->styleImportPath(customStyleName);
             if (!customStyle.isEmpty()) {
                 styleName = customStyleName;