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

Change-Id: Ica7f98ed62f5374526c8d7406487f523befe83fa

1 files changed, 3 insertions, 2 deletions

diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index 23d3c49..1b7ad72 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -55,6 +55,7 @@
 #include <QModbusRtuSerialSlave>
 #include <QModbusTcpServer>
 #include <QRegularExpression>
+#include <QRegularExpressionValidator>
 #include <QStatusBar>
 #include <QUrl>
 
@@ -326,8 +327,8 @@ void MainWindow::setupWidgetContainers()
     for (QLineEdit *lineEdit : qle) {
         registers.insert(lineEdit->objectName(), lineEdit);
         lineEdit->setProperty("ID", regexp.match(lineEdit->objectName()).captured("ID").toInt());
-        lineEdit->setValidator(new QRegExpValidator(QRegExp(QStringLiteral("[0-9a-f]{0,4}"),
-            Qt::CaseInsensitive), this));
+        lineEdit->setValidator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[0-9a-f]{0,4}"),
+            QRegularExpression::CaseInsensitiveOption), this));
         connect(lineEdit, &QLineEdit::textChanged, this, &MainWindow::setRegister);
     }
 }