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

diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h
index b7264d0973..8a498434aa 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.h
+++ b/src/plugins/platforms/qnx/qqnxscreen.h
@@ -71,26 +71,26 @@ public:
     QQnxScreen(screen_context_t context, screen_display_t display, bool primaryScreen);
     ~QQnxScreen();
 
-    QPixmap grabWindow(WId window, int x, int y, int width, int height) const;
+    QPixmap grabWindow(WId window, int x, int y, int width, int height) const override;
 
-    QRect geometry() const { return m_currentGeometry; }
-    QRect availableGeometry() const;
-    int depth() const;
-    QImage::Format format() const { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; }
-    QSizeF physicalSize() const { return m_currentPhysicalSize; }
+    QRect geometry() const override { return m_currentGeometry; }
+    QRect availableGeometry() const override;
+    int depth() const override;
+    QImage::Format format() const override { return (depth() == 32) ? QImage::Format_RGB32 : QImage::Format_RGB16; }
+    QSizeF physicalSize() const override { return m_currentPhysicalSize; }
 
-    qreal refreshRate() const;
+    qreal refreshRate() const override;
 
-    Qt::ScreenOrientation nativeOrientation() const;
-    Qt::ScreenOrientation orientation() const;
+    Qt::ScreenOrientation nativeOrientation() const override;
+    Qt::ScreenOrientation orientation() const override;
 
-    QWindow *topLevelAt(const QPoint &point) const;
+    QWindow *topLevelAt(const QPoint &point) const override;
 
     bool isPrimaryScreen() const { return m_primaryScreen; }
 
     int rotation() const { return m_currentRotation; }
 
-    QString name() const { return m_name; }
+    QString name() const override { return m_name; }
 
     int nativeFormat() const { return (depth() == 32) ? SCREEN_FORMAT_RGBA8888 : SCREEN_FORMAT_RGB565; }
     screen_display_t nativeDisplay() const { return m_display; }
@@ -111,7 +111,7 @@ public:
     QQnxWindow *rootWindow() const;
     void setRootWindow(QQnxWindow*);
 
-    QPlatformCursor *cursor() const;
+    QPlatformCursor *cursor() const override;
 
 Q_SIGNALS:
     void foreignWindowCreated(void *window);