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

Conflicts:
	examples/network/network-chat/peermanager.cpp
	src/widgets/util/qsystemtrayicon.cpp
	src/widgets/util/qsystemtrayicon_qpa.cpp
	src/widgets/util/qsystemtrayicon_win.cpp
	src/widgets/util/qsystemtrayicon_x11.cpp

Change-Id: I1c026df83818c0ccaf956980370e7522960627db

2 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp
index 5871026f95..41ee5a9cef 100644
--- a/src/corelib/doc/snippets/qstring/main.cpp
+++ b/src/corelib/doc/snippets/qstring/main.cpp
@@ -380,14 +380,14 @@ void Widget::fillFunction()
 void Widget::fromRawDataFunction()
 {
     //! [22]
-    QRegExp pattern;
+    QRegularExpression pattern("\u00A4");
     static const QChar unicode[] = {
             0x005A, 0x007F, 0x00A4, 0x0060,
             0x1009, 0x0020, 0x0020};
     int size = sizeof(unicode) / sizeof(QChar);
 
     QString str = QString::fromRawData(unicode, size);
-    if (str.contains(QRegExp(pattern))) {
+    if (str.contains(pattern) {
         // ...
     //! [22] //! [23]
     }
diff --git a/src/corelib/doc/snippets/qstringlist/main.cpp b/src/corelib/doc/snippets/qstringlist/main.cpp
index 7e7d55ca30..4d9c015747 100644
--- a/src/corelib/doc/snippets/qstringlist/main.cpp
+++ b/src/corelib/doc/snippets/qstringlist/main.cpp
@@ -97,7 +97,7 @@ Widget::Widget(QWidget *parent)
 //! [6]
 
 //! [7]
-    QStringList monospacedFonts = fonts.filter(QRegExp("Courier|Fixed"));
+    QStringList monospacedFonts = fonts.filter(QRegularExpression("Courier|Fixed"));
 //! [7]
 
 //! [8]