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, 2 insertions, 2 deletions

diff --git a/src/corelib/statemachine/qhistorystate_p.h b/src/corelib/statemachine/qhistorystate_p.h
index 4a4442d7dd..d22e5c4aaf 100644
--- a/src/corelib/statemachine/qhistorystate_p.h
+++ b/src/corelib/statemachine/qhistorystate_p.h
@@ -88,8 +88,8 @@ protected:
     // state, it will handle this transition as a special case. The history state itself is never
     // entered either: either the stored configuration will be used, or the target(s) of this
     // transition are used.
-    virtual bool eventTest(QEvent *event) { Q_UNUSED(event); return false; }
-    virtual void onTransition(QEvent *event) { Q_UNUSED(event); }
+    bool eventTest(QEvent *event)  override { Q_UNUSED(event); return false; }
+    void onTransition(QEvent *event) override { Q_UNUSED(event); }
 };
 
 QT_END_NAMESPACE