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

Conflicts:
	src/network/socket/qnativesocketengine_winrt.cpp
	tools/configure/configureapp.cpp
	tools/configure/environment.cpp

Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
index d057603034..7f365f0e8a 100644
--- a/src/corelib/io/qtemporaryfile_p.h
+++ b/src/corelib/io/qtemporaryfile_p.h
@@ -70,7 +70,7 @@ protected:
     explicit QTemporaryFilePrivate(const QString &templateNameIn);
     ~QTemporaryFilePrivate();
 
-    QAbstractFileEngine *engine() const;
+    QAbstractFileEngine *engine() const override;
     void resetFileEngine() const;
 
     bool autoRemove = true;
@@ -99,14 +99,14 @@ public:
     ~QTemporaryFileEngine();
 
     bool isReallyOpen() const;
-    void setFileName(const QString &file);
+    void setFileName(const QString &file) override;
     void setFileTemplate(const QString &fileTemplate);
 
-    bool open(QIODevice::OpenMode flags);
-    bool remove();
-    bool rename(const QString &newName);
-    bool renameOverwrite(const QString &newName);
-    bool close();
+    bool open(QIODevice::OpenMode flags) override;
+    bool remove() override;
+    bool rename(const QString &newName) override;
+    bool renameOverwrite(const QString &newName) override;
+    bool close() override;
 
     quint32 fileMode;
     bool filePathIsTemplate;