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

diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h
index 6f701b9f82..059ff2d470 100644
--- a/src/widgets/kernel/qlayoutitem.h
+++ b/src/widgets/kernel/qlayoutitem.h
@@ -101,14 +101,14 @@ public:
     void changeSize(int w, int h,
                      QSizePolicy::Policy hData = QSizePolicy::Minimum,
                      QSizePolicy::Policy vData = QSizePolicy::Minimum);
-    QSize sizeHint() const;
-    QSize minimumSize() const;
-    QSize maximumSize() const;
-    Qt::Orientations expandingDirections() const;
-    bool isEmpty() const;
-    void setGeometry(const QRect&);
-    QRect geometry() const;
-    QSpacerItem *spacerItem();
+    QSize sizeHint() const override;
+    QSize minimumSize() const override;
+    QSize maximumSize() const override;
+    Qt::Orientations expandingDirections() const override;
+    bool isEmpty() const override;
+    void setGeometry(const QRect&) override;
+    QRect geometry() const override;
+    QSpacerItem *spacerItem() override;
     QSizePolicy sizePolicy() const { return sizeP; }
 
 private:
@@ -126,18 +126,18 @@ public:
     explicit QWidgetItem(QWidget *w) : wid(w) { }
     ~QWidgetItem();
 
-    QSize sizeHint() const;
-    QSize minimumSize() const;
-    QSize maximumSize() const;
-    Qt::Orientations expandingDirections() const;
-    bool isEmpty() const;
-    void setGeometry(const QRect&);
-    QRect geometry() const;
-    virtual QWidget *widget();
-
-    bool hasHeightForWidth() const;
-    int heightForWidth(int) const;
-    QSizePolicy::ControlTypes controlTypes() const;
+    QSize sizeHint() const override;
+    QSize minimumSize() const override;
+    QSize maximumSize() const override;
+    Qt::Orientations expandingDirections() const override;
+    bool isEmpty() const override;
+    void setGeometry(const QRect&) override;
+    QRect geometry() const override;
+    QWidget *widget() override;
+
+    bool hasHeightForWidth() const override;
+    int heightForWidth(int) const override;
+    QSizePolicy::ControlTypes controlTypes() const override;
 protected:
     QWidget *wid;
 };
@@ -148,10 +148,10 @@ public:
     explicit QWidgetItemV2(QWidget *widget);
     ~QWidgetItemV2();
 
-    QSize sizeHint() const;
-    QSize minimumSize() const;
-    QSize maximumSize() const;
-    int heightForWidth(int width) const;
+    QSize sizeHint() const override;
+    QSize minimumSize() const override;
+    QSize maximumSize() const override;
+    int heightForWidth(int width) const override;
 
 private:
     enum { Dirty = -123, HfwCacheMaxSize = 3 };