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

Conflicts:
	src/corelib/io/qfilesystemengine_win.cpp
	src/gui/text/qdistancefield.cpp
	src/plugins/platforms/xcb/qxcbconnection.h

Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e

2 files changed, 6 insertions, 5 deletions

diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/examples/sql/relationaltablemodel/relationaltablemodel.cpp
index c8faece1dd..5292256cd9 100644
--- a/examples/sql/relationaltablemodel/relationaltablemodel.cpp
+++ b/examples/sql/relationaltablemodel/relationaltablemodel.cpp
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
 
     initializeModel(&model);
 
-    QTableView *view = createView(QObject::tr("Relational Table Model"), &model);
+    QScopedPointer<QTableView> view(createView(QObject::tr("Relational Table Model"), &model));
     view->show();
 
     return app.exec();
diff --git a/examples/widgets/tools/treemodelcompleter/mainwindow.cpp b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp
index c00e058fc4..4aabb04023 100644
--- a/examples/widgets/tools/treemodelcompleter/mainwindow.cpp
+++ b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp
@@ -194,16 +194,17 @@ QAbstractItemModel *MainWindow::modelFromFile(const QString& fileName)
         if (line.isEmpty() || trimmedLine.isEmpty())
             continue;
 
-        QRegExp re("^\\s+");
-        int nonws = re.indexIn(line);
+        QRegularExpression re("^\\s+");
+        QRegularExpressionMatch match = re.match(line);
+        int nonws = match.capturedStart();
         int level = 0;
         if (nonws == -1) {
             level = 0;
         } else {
             if (line.startsWith("\t")) {
-                level = re.cap(0).length();
+                level = match.capturedLength();
             } else {
-                level = re.cap(0).length()/4;
+                level = match.capturedLength()/4;
             }
         }