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

Change-Id: Ica7f98ed62f5374526c8d7406487f523befe83fa

2 files changed, 27 insertions, 2 deletions

diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1
new file mode 100644
index 0000000..030ea3f
--- /dev/null
+++ b/dist/changes-5.11.1
@@ -0,0 +1,24 @@
+Qt 5.11.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              Qt 5.11.1 Changes                           *
+****************************************************************************
+
+ - This release contains only minor code improvements.
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);
     }
 }