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

diff --git a/src/printsupport/kernel/qpaintengine_preview_p.h b/src/printsupport/kernel/qpaintengine_preview_p.h
index 6277451bfa..31b3142cb6 100644
--- a/src/printsupport/kernel/qpaintengine_preview_p.h
+++ b/src/printsupport/kernel/qpaintengine_preview_p.h
@@ -69,33 +69,33 @@ public:
     QPreviewPaintEngine();
     ~QPreviewPaintEngine();
 
-    bool begin(QPaintDevice *dev);
-    bool end();
+    bool begin(QPaintDevice *dev) override;
+    bool end() override;
 
-    void updateState(const QPaintEngineState &state);
+    void updateState(const QPaintEngineState &state) override;
 
-    void drawPath(const QPainterPath &path);
-    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
-    void drawTextItem(const QPointF &p, const QTextItem &textItem);
+    void drawPath(const QPainterPath &path) override;
+    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override;
+    void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
 
-    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
-    void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p);
+    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
+    void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p) override;
 
     QList<const QPicture *> pages();
 
-    QPaintEngine::Type type() const { return Picture; }
+    QPaintEngine::Type type() const override { return Picture; }
 
     void setProxyEngines(QPrintEngine *printEngine, QPaintEngine *paintEngine);
 
-    void setProperty(PrintEnginePropertyKey key, const QVariant &value);
-    QVariant property(PrintEnginePropertyKey key) const;
+    void setProperty(PrintEnginePropertyKey key, const QVariant &value) override;
+    QVariant property(PrintEnginePropertyKey key) const override;
 
-    bool newPage();
-    bool abort();
+    bool newPage() override;
+    bool abort() override;
 
-    int metric(QPaintDevice::PaintDeviceMetric) const;
+    int metric(QPaintDevice::PaintDeviceMetric) const override;
 
-    QPrinter::PrinterState printerState() const;
+    QPrinter::PrinterState printerState() const override;
 };
 
 QT_END_NAMESPACE