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

Conflicts:
	configure
	qmake/Makefile.unix.macos
	qmake/Makefile.unix.win32
	qmake/generators/win32/msvc_vcproj.cpp
	src/3rdparty/pcre/qt_attribution.json
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qdeadlinetimer.cpp
	src/platformsupport/kmsconvenience/qkmsdevice.cpp
	src/platformsupport/kmsconvenience/qkmsdevice_p.h
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
	tests/manual/qstorageinfo/printvolumes.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e

1 files changed, 5 insertions, 5 deletions

diff --git a/examples/widgets/statemachine/pingpong/main.cpp b/examples/widgets/statemachine/pingpong/main.cpp
index 8c3b9f674b..c09060c502 100644
--- a/examples/widgets/statemachine/pingpong/main.cpp
+++ b/examples/widgets/statemachine/pingpong/main.cpp
@@ -75,7 +75,7 @@ public:
         : QState(parent) {}
 
 protected:
-    virtual void onEntry(QEvent *) override
+    void onEntry(QEvent *) override
     {
         machine()->postEvent(new PingEvent());
         fprintf(stdout, "ping?\n");
@@ -90,10 +90,10 @@ public:
     PongTransition() {}
 
 protected:
-    virtual bool eventTest(QEvent *e) override {
+    bool eventTest(QEvent *e) override {
         return (e->type() == QEvent::User+3);
     }
-    virtual void onTransition(QEvent *) override
+    void onTransition(QEvent *) override
     {
         machine()->postDelayedEvent(new PingEvent(), 500);
         fprintf(stdout, "ping?\n");
@@ -108,10 +108,10 @@ public:
     PingTransition() {}
 
 protected:
-    virtual bool eventTest(QEvent *e) override {
+    bool eventTest(QEvent *e) override {
         return (e->type() == QEvent::User+2);
     }
-    virtual void onTransition(QEvent *) override
+    void onTransition(QEvent *) override
     {
         machine()->postDelayedEvent(new PongEvent(), 500);
         fprintf(stdout, "pong!\n");