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

Conflicts:
	src/corelib/plugin/qlibrary_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp

Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb

1 files changed, 14 insertions, 14 deletions

diff --git a/examples/widgets/tools/settingseditor/variantdelegate.h b/examples/widgets/tools/settingseditor/variantdelegate.h
index a15228fdf9..7cd9fa9ee8 100644
--- a/examples/widgets/tools/settingseditor/variantdelegate.h
+++ b/examples/widgets/tools/settingseditor/variantdelegate.h
@@ -52,7 +52,7 @@
 #define VARIANTDELEGATE_H
 
 #include <QItemDelegate>
-#include <QRegExp>
+#include <QRegularExpression>
 
 class VariantDelegate : public QItemDelegate
 {
@@ -73,19 +73,19 @@ public:
     static QString displayText(const QVariant &value);
 
 private:
-    mutable QRegExp boolExp;
-    mutable QRegExp byteArrayExp;
-    mutable QRegExp charExp;
-    mutable QRegExp colorExp;
-    mutable QRegExp dateExp;
-    mutable QRegExp dateTimeExp;
-    mutable QRegExp doubleExp;
-    mutable QRegExp pointExp;
-    mutable QRegExp rectExp;
-    mutable QRegExp signedIntegerExp;
-    mutable QRegExp sizeExp;
-    mutable QRegExp timeExp;
-    mutable QRegExp unsignedIntegerExp;
+    mutable QRegularExpression boolExp;
+    mutable QRegularExpression byteArrayExp;
+    mutable QRegularExpression charExp;
+    mutable QRegularExpression colorExp;
+    mutable QRegularExpression dateExp;
+    mutable QRegularExpression dateTimeExp;
+    mutable QRegularExpression doubleExp;
+    mutable QRegularExpression pointExp;
+    mutable QRegularExpression rectExp;
+    mutable QRegularExpression signedIntegerExp;
+    mutable QRegularExpression sizeExp;
+    mutable QRegularExpression timeExp;
+    mutable QRegularExpression unsignedIntegerExp;
 };
 
 #endif