Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ic443284cb2ae46839cbd90d133c6a503bf721058

1 files changed, 4 insertions, 3 deletions

diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index 28c9b2b0..e20596b6 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 {
@@ -297,8 +297,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;