Remove most compiler warnings about missing overrides

Remove around 1000 compiler warnings about missing overrides
in our auto tests.

This significantly reduce the compiler warning noise in our auto
tests, so that one can actually better see the real problems
inbetween.

Change-Id: Id0c04dba43fcaf55d8cd2b5c6697358857c31bf9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

43 files changed, 197 insertions, 185 deletions

diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index a73279018d..266ed0de05 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -104,12 +104,14 @@ public:
     bool wasActive() const { return mWasActive; }
     bool wasModalWindow() const { return mWasModalWindow; }
 
-    int exec() {
+    int exec() override
+    {
         tId = startTimer(300);
         return QDialog::exec();
     }
 protected:
-    void timerEvent(QTimerEvent *event) {
+    void timerEvent(QTimerEvent *event) override
+    {
         if (tId == event->timerId()) {
             killTimer(tId);
             mWasActive = isActiveWindow();
@@ -414,7 +416,7 @@ class TestRejectDialog : public QDialog
 {
     public:
         TestRejectDialog() : cancelReject(false), called(0) {}
-        void reject()
+        void reject() override
         {
             called++;
             if (!cancelReject)
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 20c0dd993b..4b9466d3b6 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -201,8 +201,8 @@ class MyAbstractItemDelegate : public QAbstractItemDelegate
 {
 public:
     MyAbstractItemDelegate() : QAbstractItemDelegate() {};
-    void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const {}
-    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { return QSize(); }
+    void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override {}
+    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override { return QSize(); }
 };
 
 // emitted any time the selection model emits current changed
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index cbb1c72b11..beec8db0d9 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -482,7 +482,7 @@ public:
       {};
 
 protected:
-      bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
+      bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override
       {
             QModelIndex parentIndex;
             parentIndex = source_parent;
@@ -515,7 +515,7 @@ public:
         {
         }
 protected:
-        virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const
+        virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const override
         {
             QFileSystemModel * const model = qobject_cast<QFileSystemModel *>(sourceModel());
             const QFileInfo leftInfo(model->fileInfo(left));
diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
index 877784041b..2a40af320b 100644
--- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
@@ -48,7 +48,7 @@ class tst_QInputDialog : public QObject
     static void testFuncGetText(QInputDialog *dialog);
     static void testFuncGetItem(QInputDialog *dialog);
     static void testFuncSingleStepDouble(QInputDialog *dialog);
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;
 private slots:
     void getInt_data();
     void getInt();
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 3169a9cb4e..dfb8dc1c37 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -80,7 +80,8 @@ public:
     bool resized;
 
 protected:
-    void resizeEvent ( QResizeEvent * event ) {
+    void resizeEvent ( QResizeEvent * event ) override
+    {
         resized = true;
         QMessageBox::resizeEvent(event);
     }
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index e9bf14b1e6..3e8a81c33c 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -821,9 +821,9 @@ struct MyPage2 : public QWizardPage
 public:
     MyPage2() : init(0), cleanup(0), validate(0) {}
 
-    void initializePage() { ++init; QWizardPage::initializePage(); }
-    void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); }
-    bool validatePage() { ++validate; return QWizardPage::validatePage(); }
+    void initializePage() override { ++init; QWizardPage::initializePage(); }
+    void cleanupPage() override { ++cleanup; QWizardPage::cleanupPage(); }
+    bool validatePage() override { ++validate; return QWizardPage::validatePage(); }
 
     bool sanityCheck(int init, int cleanup)
     {
@@ -1592,13 +1592,13 @@ protected:
 
 class SetPage : public Operation
 {
-    void apply(QWizard *wizard) const
+    void apply(QWizard *wizard) const override
     {
         wizard->restart();
         for (int j = 0; j < page; ++j)
             wizard->next();
     }
-    QString describe() const { return QLatin1String("set page ") + QString::number(page); }
+    QString describe() const override { return QLatin1String("set page ") + QString::number(page); }
     int page;
 public:
     static QSharedPointer<SetPage> create(int page)
@@ -1611,8 +1611,8 @@ public:
 
 class SetStyle : public Operation
 {
-    void apply(QWizard *wizard) const { wizard->setWizardStyle(style); }
-    QString describe() const { return QLatin1String("set style ") + QString::number(style); }
+    void apply(QWizard *wizard) const override { wizard->setWizardStyle(style); }
+    QString describe() const override { return QLatin1String("set style ") + QString::number(style); }
     QWizard::WizardStyle style;
 public:
     static QSharedPointer<SetStyle> create(QWizard::WizardStyle style)
@@ -1625,8 +1625,8 @@ public:
 
 class SetOption : public Operation
 {
-    void apply(QWizard *wizard) const { wizard->setOption(option, on); }
-    QString describe() const;
+    void apply(QWizard *wizard) const override { wizard->setOption(option, on); }
+    QString describe() const override;
     QWizard::WizardOption option;
     bool on;
 public:
@@ -2117,8 +2117,8 @@ class WizardPage : public QWizardPage
 {
     Q_OBJECT
     bool shown_;
-    void showEvent(QShowEvent *) { shown_ = true; }
-    void hideEvent(QHideEvent *) { shown_ = false; }
+    void showEvent(QShowEvent *) override { shown_ = true; }
+    void hideEvent(QHideEvent *) override { shown_ = false; }
 public:
     WizardPage() : shown_(false) {}
     bool shown() const { return shown_; }
@@ -2511,7 +2511,7 @@ private:
     QTreeWidget *treeWidget;
     QSizePolicy::Policy verticalPolicy;
 
-    void initializePage()
+    void initializePage() override
     {
         if (layout())
             delete layout();
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp
index 0969cecc45..cc48543a76 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp
@@ -61,7 +61,7 @@ class taskQTBUG_25691Page2 : public QWizardPage
 public:
     taskQTBUG_25691Page2( QWidget * parent = 0 );
 
-    virtual void initializePage(void);
+    virtual void initializePage(void) override;
 
     ~taskQTBUG_25691Page2(void);
 
diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
index 38181c8af0..bd1b56ebc1 100644
--- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -73,7 +73,7 @@ public:
           m_painter(0), m_styleOption(0)
     {}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         m_painter = painter;
         m_styleOption = option;
@@ -101,7 +101,7 @@ public:
           doNothingInDraw(false), m_painter(0), m_styleOption(0), m_source(0), m_opacity(1.0)
     {}
 
-    QRectF boundingRectFor(const QRectF &rect) const
+    QRectF boundingRectFor(const QRectF &rect) const override
     { return rect.adjusted(-m_margin, -m_margin, m_margin, m_margin); }
 
     void reset()
@@ -123,7 +123,7 @@ public:
     int margin() const
     { return m_margin; }
 
-    void draw(QPainter *painter)
+    void draw(QPainter *painter) override
     {
         ++numRepaints;
         if (doNothingInDraw)
@@ -135,7 +135,7 @@ public:
         drawSource(painter);
     }
 
-    void sourceChanged(QGraphicsEffect::ChangeFlags flags)
+    void sourceChanged(QGraphicsEffect::ChangeFlags flags) override
     { m_sourceChangedFlags |= flags; }
 
     int numRepaints;
@@ -509,10 +509,10 @@ public:
         , repaints(0)
     {}
 
-    QRectF boundingRectFor(const QRectF &rect) const
+    QRectF boundingRectFor(const QRectF &rect) const override
     { return rect; }
 
-    void draw(QPainter *painter)
+    void draw(QPainter *painter) override
     {
         QCOMPARE(sourcePixmap(Qt::LogicalCoordinates).handle(), pixmap.handle());
         QVERIFY((painter->worldTransform().type() <= QTransform::TxTranslate) == (sourcePixmap(Qt::DeviceCoordinates).handle() == pixmap.handle()));
@@ -551,10 +551,10 @@ void tst_QGraphicsEffect::drawPixmapItem()
 class DeviceEffect : public QGraphicsEffect
 {
 public:
-    QRectF boundingRectFor(const QRectF &rect) const
+    QRectF boundingRectFor(const QRectF &rect) const override
     { return rect; }
 
-    void draw(QPainter *painter)
+    void draw(QPainter *painter) override
     {
         QPoint offset;
         QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, QGraphicsEffect::NoPad);
@@ -648,7 +648,7 @@ public:
     MyGraphicsItem(QGraphicsItem *parent = 0) :
             QGraphicsWidget(parent), nbPaint(0)
     {}
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         nbPaint++;
         QGraphicsWidget::paint(painter, option, widget);
diff --git a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
index 99b0ccd10d..5cc08617c6 100644
--- a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -59,7 +59,8 @@ public:
 
     CustomFilter() : QPixmapFilter((QPixmapFilter::FilterType) Type, 0) { };
 
-    void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const {
+    void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const override
+    {
         p->drawPixmap(QRectF(pt, srcRect.size()), src, srcRect);
     }
 };
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index e19ef4c308..934505034e 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -87,7 +87,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         Q_UNUSED(option);
         Q_UNUSED(widget);
@@ -1113,7 +1113,7 @@ public:
     }
 
     virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
-                            const QWidget * widget = 0 ) const;
+                            const QWidget * widget = 0 ) const override;
 
     int hspacing;
     int vspacing;
@@ -1122,7 +1122,7 @@ public:
                       QSizePolicy::ControlType control2,
                       Qt::Orientation orientation,
                       const QStyleOption *option = 0,
-                      const QWidget *widget = 0) const;
+                      const QWidget *widget = 0) const override;
 
 };
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index 65480bf665..d1f8954ab9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -163,7 +163,7 @@ public:
         }
 
 protected:
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override;
 };
 
 QSizeF TestWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index eaad5e478d..5df8b7c1ac 100644
--- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -43,7 +43,7 @@ public:
           m_painter(0)
     {}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         m_painter = painter;
         ++numRepaints;
@@ -70,7 +70,7 @@ public:
           m_painter(0), m_source(0)
     {}
 
-    QRectF boundingRectFor(const QRectF &rect) const
+    QRectF boundingRectFor(const QRectF &rect) const override
     { return rect.adjusted(-m_margin, -m_margin, m_margin, m_margin); }
 
     void reset()
@@ -94,7 +94,7 @@ public:
     int margin() const
     { return m_margin; }
 
-    void draw(QPainter *painter)
+    void draw(QPainter *painter) override
     {
         ++numRepaints;
         if (storeDeviceDependentStuff) {
@@ -109,7 +109,7 @@ public:
         source()->draw(painter);
     }
 
-    void sourceChanged(ChangeFlags)
+    void sourceChanged(ChangeFlags) override
     { m_sourceChanged = true; }
 
     void sourceBoundingRectChanged()
@@ -310,11 +310,13 @@ public:
     {
     }
 
-    QRectF boundingRectFor(const QRectF &src) const {
+    QRectF boundingRectFor(const QRectF &src) const override
+    {
         return src.adjusted(-10, -10, 10, 10);
     }
 
-    void draw(QPainter *) {
+    void draw(QPainter *) override
+    {
         pix = source()->pixmap(coordinateMode, &offset, padMode);
     }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 4d5857c3c8..7e7536a94c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -121,7 +121,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         Q_UNUSED(option);
         Q_UNUSED(widget);
@@ -130,7 +130,7 @@ public:
         painter->drawLine(rect().bottomLeft(), rect().topRight());
     }
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
     {
         if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) {
             return m_sizeHints[which];
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index c5009e9847..cc416f76b2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -93,7 +93,8 @@ public:
     TestGraphicsWidget(QGraphicsWidget *parent = 0) : QGraphicsWidget(parent)
     { }
 
-    bool event(QEvent *e) {
+    bool event(QEvent *e) override
+    {
         ++(m_eventCount[int(e->type())]);
         return QGraphicsWidget::event(e);
     }
@@ -111,7 +112,7 @@ public:
         functionCount.clear();
     }
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         QGraphicsWidget::setGeometry(rect);
         ++(functionCount[SetGeometry]);
@@ -235,13 +236,13 @@ class TestLayout : public QGraphicsLinearLayout
         setSpacing(0);
     }
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         ++(functionCount[SetGeometry]);
         QGraphicsLinearLayout::setGeometry(rect);
     }
 
-    void invalidate()
+    void invalidate() override
     {
         ++(functionCount[Invalidate]);
         QGraphicsLinearLayout::invalidate();
@@ -569,27 +570,29 @@ class Layout : public QGraphicsLayout
 public:
     Layout(QGraphicsLayoutItem *parentItem = 0) : QGraphicsLayout(parentItem) {}
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         QGraphicsLayout::setGeometry(rect);
     }
 
-    int count() const {
+    int count() const override
+    {
         return 0;
     }
 
-    QGraphicsLayoutItem *itemAt(int index) const {
+    QGraphicsLayoutItem *itemAt(int index) const override
+    {
         Q_UNUSED(index);
         return 0;
     }
 
-    void removeAt(int index)
+    void removeAt(int index) override
     {
         Q_UNUSED(index);
     }
 
 protected:
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
     {
         Q_UNUSED(constraint);
         Q_UNUSED(which);
@@ -634,9 +637,9 @@ public:
         setGraphicsItem(item);
     }
 
-    void setGeometry(const QRectF &geom);
+    void setGeometry(const QRectF &geom) override;
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override;
 
     inline QGraphicsRectItem *rectItem() {
         return static_cast<QGraphicsRectItem *>(graphicsItem());
@@ -674,7 +677,8 @@ public:
         connect(&m_timeline, SIGNAL(valueChanged(qreal)), this, SLOT(valueChanged(qreal)));
     }
 
-    void setGeometry(const QRectF &geom) {
+    void setGeometry(const QRectF &geom) override
+    {
         fromGeoms.clear();
         toGeoms.clear();
         for (int i = 0; i < count(); ++i) {
@@ -759,7 +763,7 @@ public:
         setOwnedByLayout(true);
     }
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override;
 
     ~CustomLayoutItem() {
         m_destructedSet->insert(this);
@@ -790,9 +794,9 @@ public:
         m_destructedSet = destructedSet;
     }
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override;
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget * = 0)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget * = 0) override
     {
         const QRect r = option->rect.adjusted(0, 0, -1, -1);
         painter->drawLine(r.topLeft(), r.bottomRight());
@@ -844,18 +848,18 @@ CustomLayout(QGraphicsLayoutItem *parent)
 {
 }
 
-int count() const
+int count() const override
 {
     return items.count();
 }
 
-QGraphicsLayoutItem* itemAt(int index) const
+QGraphicsLayoutItem* itemAt(int index) const override
 {
     return items.at(index);
 }
 
 
-void removeAt(int index)
+void removeAt(int index) override
 {
     items.removeAt(index);
 }
@@ -897,7 +901,7 @@ void updateParentWidget(QGraphicsWidget *item)
     }
 }
 
-QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const
+QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const override
 {
     return QSizeF(50,50);
 }
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
index af21b9f391..2d8bf40ee5 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
@@ -72,13 +72,13 @@ public:
         { return QRectF(); }
 
     // QGraphicsLayoutItem::setGeometry is a pure virtual function
-    void setGeometry(QRectF const&) {}
+    void setGeometry(QRectF const&) override {}
 
     // QGraphicsLayoutItem::sizeHint is a pure virtual function
-    QSizeF sizeHint(Qt::SizeHint, QSizeF const& = QSizeF()) const
+    QSizeF sizeHint(Qt::SizeHint, QSizeF const& = QSizeF()) const override
         { return QSizeF(); }
 
-    void updateGeometry()
+    void updateGeometry() override
         { updateGeometryCalled++; QGraphicsLayoutItem::updateGeometry(); }
     int updateGeometryCalled;
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 817f67540e..0851b20927 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -107,7 +107,7 @@ public:
         layoutDirectionChange(0)
         { }
 
-    void widgetEvent(QEvent *e)
+    void widgetEvent(QEvent *e) override
     {
         switch (e->type()) {
         case QEvent::GraphicsSceneResize:
@@ -145,7 +145,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = 0, const QBrush &brush = QBrush()) : QGraphicsWidget(parent){ m_brush = brush;}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         Q_UNUSED(option);
         Q_UNUSED(widget);
@@ -158,7 +158,8 @@ public:
         updateGeometry();
     }
 
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const {
+    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
+    {
         if (m_sizeHints[which].isValid()) {
             return m_sizeHints[which];
         }
diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
index 6ef17a14af..ddcdc809d9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
@@ -53,8 +53,8 @@ class MyGraphicsObject : public QGraphicsObject
 {
 public:
     MyGraphicsObject() : QGraphicsObject() {}
-    virtual QRectF boundingRect() const { return QRectF(); }
-    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+    virtual QRectF boundingRect() const override { return QRectF(); }
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override {}
 };
 
 void tst_QGraphicsObject::pos()
@@ -223,9 +223,9 @@ public:
         }
     }
 
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0)
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0) override
     { }
-    QRectF boundingRect() const
+    QRectF boundingRect() const override
     { return QRectF(); }
 
     bool *wasDeleted;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 0b3e132936..6b292bc713 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -122,7 +122,7 @@ public:
     bool isHovered = false;
 
 protected:
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) override
     {
         isHovered = (option->state & QStyle::State_MouseOver);
 
@@ -2190,7 +2190,7 @@ public:
     bool ignoresDragMove = false;
 
 protected:
-    void dragEnterEvent(QGraphicsSceneDragDropEvent *event)
+    void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         event->setAccepted(!ignoresDragEnter);
@@ -2199,20 +2199,20 @@ protected:
         eventList << event->type();
     }
 
-    void dragMoveEvent(QGraphicsSceneDragDropEvent *event)
+    void dragMoveEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         event->setAccepted(!ignoresDragMove);
         eventList << event->type();
     }
 
-    void dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         eventList << event->type();
     }
 
-    void dropEvent(QGraphicsSceneDragDropEvent *event)
+    void dropEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         eventList << event->type();
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index 4f2c310135..d875eb1db4 100644
--- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -228,9 +228,9 @@ class CustomShapeItem : public QGraphicsItem
 public:
     CustomShapeItem(const QPainterPath &shape) : QGraphicsItem(0), mShape(shape) {}
 
-    QPainterPath shape() const { return mShape; }
-    QRectF boundingRect() const { return mShape.boundingRect(); }
-    void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) {}
+    QPainterPath shape() const override { return mShape; }
+    QRectF boundingRect() const override { return mShape.boundingRect(); }
+    void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) override {}
 private:
     QPainterPath mShape;
 };
@@ -281,7 +281,7 @@ public:
     {
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */) override
     {
         painter->setBrush(brush);
         painter->drawRect(boundingRect());
@@ -336,8 +336,8 @@ void tst_QGraphicsSceneIndex::clear()
         MyItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent), numPaints(0) {}
         int numPaints;
     protected:
-        QRectF boundingRect() const { return QRectF(0, 0, 10, 10); }
-        void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *)
+        QRectF boundingRect() const override { return QRectF(0, 0, 10, 10); }
+        void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *) override
         { ++numPaints; }
     };
 
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 2517d3bd5a..5f98902abd 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -196,13 +196,13 @@ class DialogItemDelegate : public QStyledItemDelegate
 {
 public:
     using QStyledItemDelegate::QStyledItemDelegate;
-    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const override
     {
         openedEditor = new QDialog(parent);
         return openedEditor;
     }
 
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override
     {
         Q_UNUSED(model);
         Q_UNUSED(index);
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 155b5389fc..16f8b97d49 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -77,7 +77,7 @@ public:
 
     void drawDisplay(QPainter *painter,
                      const QStyleOptionViewItem &option,
-                     const QRect &rect, const QString &text) const
+                     const QRect &rect, const QString &text) const override
     {
         displayText = text;
         displayFont = option.font;
@@ -86,7 +86,7 @@ public:
 
     void drawDecoration(QPainter *painter,
                         const QStyleOptionViewItem &option,
-                        const QRect &rect, const QPixmap &pixmap) const
+                        const QRect &rect, const QPixmap &pixmap) const override
     {
         decorationPixmap = pixmap;
         decorationRect = rect;
@@ -113,7 +113,7 @@ public:
         return QItemDelegate::rect(option, index, role);
     }
 
-    inline bool eventFilter(QObject *object, QEvent *event)
+    inline bool eventFilter(QObject *object, QEvent *event) override
     {
         return QItemDelegate::eventFilter(object, event);
     }
@@ -121,7 +121,7 @@ public:
     inline bool editorEvent(QEvent *event,
                             QAbstractItemModel *model,
                             const QStyleOptionViewItem &option,
-                            const QModelIndex &index)
+                            const QModelIndex &index) override
     {
         return QItemDelegate::editorEvent(event, model, option, index);
     }
@@ -149,19 +149,19 @@ public:
 
     ~TestItemModel() {}
 
-    int rowCount(const QModelIndex &parent) const
+    int rowCount(const QModelIndex &parent) const override
     {
         Q_UNUSED(parent);
         return 1;
     }
 
-    int columnCount(const QModelIndex &parent) const
+    int columnCount(const QModelIndex &parent) const override
     {
         Q_UNUSED(parent);
         return 1;
     }
 
-    QVariant data(const QModelIndex& index, int role) const
+    QVariant data(const QModelIndex& index, int role) const override
     {
         Q_UNUSED(index);
         static QPixmap pixmap(size);
@@ -812,7 +812,7 @@ void tst_QItemDelegate::dateTimeEditor()
 class ChooseEditorDelegate : public QItemDelegate
 {
 public:
-    virtual QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &o, const QModelIndex &i) const
+    virtual QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &o, const QModelIndex &i) const override
     {
         if (m_editor) {
             m_editor->setParent(parent);
@@ -822,7 +822,7 @@ public:
         return m_editor;
     }
 
-    virtual void destroyEditor(QWidget *editor, const QModelIndex &i) const
+    virtual void destroyEditor(QWidget *editor, const QModelIndex &i) const override
     {   // This is a reimplementation of QAbstractItemDelegate::destroyEditor just set the variable m_editor to 0
         // The only reason we do this is to avoid the not recommended direct delete of editor (destroyEditor uses deleteLater)
         QItemDelegate::destroyEditor(editor, i); // Allow destroy
@@ -1307,7 +1307,7 @@ void tst_QItemDelegate::enterKey()
     struct TestDelegate : public QItemDelegate
     {
         WidgetType widgetType;
-        virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& /*option*/, const QModelIndex& /*index*/) const
+        virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& /*option*/, const QModelIndex& /*index*/) const override
         {
             QWidget *editor = 0;
             switch(widgetType) {
@@ -1456,7 +1456,7 @@ void tst_QItemDelegate::testLineEditValidation()
 
     struct TestDelegate : public QItemDelegate
     {
-        virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+        virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override
         {
             Q_UNUSED(option);
             Q_UNUSED(index);
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index e8fd5b49cd..3cb4c58513 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1807,7 +1807,7 @@ class CustomStyle : public QProxyStyle
 public:
     CustomStyle() : QProxyStyle("Windows") { Q_ASSERT(!polished); }
     ~CustomStyle() { polished = 0; }
-    void polish(QPalette &palette)
+    void polish(QPalette &palette) override
     {
         polished++;
         palette.setColor(QPalette::Active, QPalette::Link, Qt::red);
@@ -1822,7 +1822,7 @@ class CustomStylePlugin : public QStylePlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "customstyle.json")
 public:
-    QStyle *create(const QString &) { return new CustomStyle; }
+    QStyle *create(const QString &) override { return new CustomStyle; }
 };
 
 Q_IMPORT_PLUGIN(CustomStylePlugin)
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index cbfbefaf3c..00e82248d4 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -71,7 +71,7 @@ public:
     }
 
     virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
-                            const QWidget * widget = 0 ) const;
+                            const QWidget * widget = 0 ) const override;
 
     int hspacing;
     int vspacing;
@@ -245,7 +245,7 @@ public:
     }
 
     virtual QRect subElementRect(SubElement sr, const QStyleOption *opt,
-                                const QWidget *widget) const
+                                const QWidget *widget) const override
     {
         QRect rect = opt->rect;
         switch (sr) {
@@ -411,14 +411,14 @@ class LayoutItem : public QLayoutItem
 public:
     LayoutItem(const Descr &descr) :m_descr(descr) {}
 
-    QSize sizeHint() const { return QSize(m_descr.sizeHint, 100); }
-    QSize minimumSize() const { return QSize(m_descr.minimumSize, 0); }
-    QSize maximumSize() const { return QSize(m_descr.maximumSize, QLAYOUTSIZE_MAX); }
-    Qt::Orientations expandingDirections() const
+    QSize sizeHint() const override { return QSize(m_descr.sizeHint, 100); }
+    QSize minimumSize() const override { return QSize(m_descr.minimumSize, 0); }
+    QSize maximumSize() const override { return QSize(m_descr.maximumSize, QLAYOUTSIZE_MAX); }
+    Qt::Orientations expandingDirections() const override
     { return m_descr.expanding ? Qt::Horizontal :  Qt::Orientations{}; }
-    void setGeometry(const QRect &r) { m_pos = r.x(); m_size = r.width();}
-    QRect geometry() const { return QRect(m_pos, 0, m_size, 100); }
-    bool isEmpty() const { return m_descr.empty; }
+    void setGeometry(const QRect &r) override { m_pos = r.x(); m_size = r.width();}
+    QRect geometry() const override { return QRect(m_pos, 0, m_size, 100); }
+    bool isEmpty() const override { return m_descr.empty; }
 
 private:
     Descr m_descr;
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index fd1751c5e7..06e82ecac8 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -298,7 +298,7 @@ public:
     }
 
     virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
-                            const QWidget * widget = 0 ) const;
+                            const QWidget * widget = 0 ) const override;
 
     int hspacing;
     int vspacing;
@@ -391,7 +391,7 @@ void tst_QFormLayout::contentsRect()
 class DummyMacStyle : public QCommonStyle
 {
 public:
-    virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const
+    virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override
     {
         switch(hint) {
             case SH_FormLayoutFormAlignment:
@@ -411,7 +411,7 @@ public:
 class DummyQtopiaStyle : public QCommonStyle
 {
 public:
-    virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const
+    virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override
     {
         switch(hint) {
             case SH_FormLayoutFormAlignment:
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 26dbab5e15..69d85df597 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -386,7 +386,7 @@ public:
     SizeHinter(int w, int h, QWidget *parent = 0)
         : QWidget(parent), sh(QSize(w,h)) {}
     void setSizeHint(QSize s) { sh = s; }
-    QSize sizeHint() const { return sh; }
+    QSize sizeHint() const override { return sh; }
 private:
     QSize sh;
 };
@@ -452,7 +452,7 @@ public:
     }
 
     virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr,
-                            const QWidget * widget = nullptr ) const;
+                            const QWidget * widget = nullptr ) const override;
 
     int spacing = 6;
     int margin = 9;
@@ -508,11 +508,11 @@ public:
     }
 
     void setSizeHint(const QSize &s) { sh = s; }
-    QSize sizeHint() const { return sh; }
+    QSize sizeHint() const override { return sh; }
     void setMinimumSizeHint(const QSize &s) { msh = s; }
-    QSize minimumSizeHint() const { return msh; }
+    QSize minimumSizeHint() const override { return msh; }
 
-    virtual int heightForWidth(int width) const;
+    virtual int heightForWidth(int width) const override;
 
     void setNumberOfPixels(int numPixels) {
         m_numPixels = numPixels;
@@ -901,9 +901,9 @@ public:
     }
 
     virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
-                            const QWidget * widget = 0 ) const;
+                            const QWidget * widget = 0 ) const override;
     virtual QRect subElementRect(SubElement sr, const QStyleOption *opt,
-                                const QWidget *widget) const;
+                                const QWidget *widget) const override;
 
     int hspacing;
     int vspacing;
@@ -913,7 +913,7 @@ public:
                       QSizePolicy::ControlType control2,
                       Qt::Orientation orientation,
                       const QStyleOption *option = 0,
-                      const QWidget *widget = 0) const;
+                      const QWidget *widget = 0) const override;
 
 };
 
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index e5e0a48503..dec332196b 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -104,8 +104,8 @@ public:
 
 
     void setSizeHint(const QSize &s) { sh = s; }
-    QSize sizeHint() const { return sh; }
-    QSize minimumSizeHint() const { return msh; }
+    QSize sizeHint() const override { return sh; }
+    QSize minimumSizeHint() const override { return msh; }
 
 private:
     QSize sh;
@@ -221,13 +221,13 @@ class MyLayout : public QLayout
 {
     public:
         MyLayout() : invalidated(false) {}
-        virtual void invalidate() {invalidated = true;}
+        virtual void invalidate() override {invalidated = true;}
         bool invalidated;
-        QSize sizeHint() const {return QSize();}
-        void addItem(QLayoutItem*) {}
-        QLayoutItem* itemAt(int) const {return 0;}
-        QLayoutItem* takeAt(int) {return 0;}
-        int count() const {return 0;}
+        QSize sizeHint() const override {return QSize();}
+        void addItem(QLayoutItem*) override {}
+        QLayoutItem* itemAt(int) const override {return 0;}
+        QLayoutItem* takeAt(int) override {return 0;}
+        int count() const override {return 0;}
 };
 
 void tst_QLayout::setContentsMargins()
@@ -253,7 +253,7 @@ void tst_QLayout::setContentsMargins()
 class EventReceiver : public QObject
 {
 public:
-    bool eventFilter(QObject *watched, QEvent *event)
+    bool eventFilter(QObject *watched, QEvent *event) override
     {
         if (event->type() == QEvent::Show) {
             geom = static_cast<QWidget*>(watched)->geometry();
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index 053dc03296..8721a7191a 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -284,13 +284,13 @@ protected:
         return true;
     }
 
-    void focusInEvent(QFocusEvent *event)
+    void focusInEvent(QFocusEvent *event) override
     {
         QLineEdit::focusInEvent(event);
         hasFakeEditFocus = isSingleFocusWidget();
     }
 
-    void focusOutEvent(QFocusEvent *event)
+    void focusOutEvent(QFocusEvent *event) override
     {
         hasFakeEditFocus = false;
         QLineEdit::focusOutEvent(event);
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index b3a2323d3e..356b969055 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -6986,7 +6986,7 @@ public:
     }
 
 protected:
-    void paintEvent(QPaintEvent *)
+    void paintEvent(QPaintEvent *) override
     {
         if (ellipse) {
             QPainter painter(this);
@@ -10142,7 +10142,7 @@ void tst_QWidget::focusProxy()
         int focusOutCount = 0;
 
     protected:
-        bool eventFilter(QObject *receiver, QEvent *event)
+        bool eventFilter(QObject *receiver, QEvent *event) override
         {
             if (receiver == edit) {
                 switch (event->type()) {
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index 890a53541a..17b119410f 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -523,10 +523,10 @@ public:
         : QWidget(w), m_log(log), m_ignoreDragMove(ignoreDragMove)
     {}
 protected:
-    void dragEnterEvent(QDragEnterEvent *);
-    void dragMoveEvent(QDragMoveEvent *);
-    void dragLeaveEvent(QDragLeaveEvent *);
-    void dropEvent(QDropEvent *);
+    void dragEnterEvent(QDragEnterEvent *) override;
+    void dragMoveEvent(QDragMoveEvent *) override;
+    void dragLeaveEvent(QDragLeaveEvent *) override;
+    void dropEvent(QDropEvent *) override;
 
 private:
     void formatDropEvent(const char *function, const QDropEvent *e, QTextStream &str) const;
@@ -700,7 +700,7 @@ public:
     DnDEventRecorder() { setAcceptDrops(true); }
 
 protected:
-    void mousePressEvent(QMouseEvent *)
+    void mousePressEvent(QMouseEvent *) override
     {
         QMimeData *mimeData = new QMimeData;
         mimeData->setData("application/x-dnditemdata", "some data");
@@ -709,23 +709,23 @@ protected:
         drag->exec();
     }
 
-    void dragEnterEvent(QDragEnterEvent *e)
+    void dragEnterEvent(QDragEnterEvent *e) override
     {
         e->accept();
         _dndEvents.append(QStringLiteral("DragEnter "));
     }
-    void dragMoveEvent(QDragMoveEvent *e)
+    void dragMoveEvent(QDragMoveEvent *e) override
     {
         e->accept();
         _dndEvents.append(QStringLiteral("DragMove "));
         emit dragMoveReceived();
     }
-    void dragLeaveEvent(QDragLeaveEvent *e)
+    void dragLeaveEvent(QDragLeaveEvent *e) override
     {
         e->accept();
         _dndEvents.append(QStringLiteral("DragLeave "));
     }
-    void dropEvent(QDropEvent *e)
+    void dropEvent(QDropEvent *e) override
     {
         e->accept();
         _dndEvents.append(QStringLiteral("DropEvent "));
@@ -1055,7 +1055,7 @@ void tst_QWidget_window::tst_showhide_count()
             return count;
         }
     protected:
-        bool eventFilter(QObject *receiver, QEvent *event)
+        bool eventFilter(QObject *receiver, QEvent *event) override
         {
             if (QWidget *widget = qobject_cast<QWidget*>(receiver)) {
                 const auto entry = Entry(widget, event->type());
@@ -1341,7 +1341,7 @@ void tst_QWidget_window::mouseMoveWithPopup()
         : QWidget(parent, flags|Qt::CustomizeWindowHint|Qt::FramelessWindowHint)
         {}
 
-        QSize sizeHint() const
+        QSize sizeHint() const override
         {
             if (parent())
                 return QSize(150, 100);
@@ -1360,7 +1360,7 @@ void tst_QWidget_window::mouseMoveWithPopup()
             mouseReleaseCount = 0;
         }
     protected:
-        void mousePressEvent(QMouseEvent *event)
+        void mousePressEvent(QMouseEvent *event) override
         {
             ++mousePressCount;
 
@@ -1378,12 +1378,12 @@ void tst_QWidget_window::mouseMoveWithPopup()
                 QWidget::mousePressEvent(event);
             }
         }
-        void mouseReleaseEvent(QMouseEvent *event)
+        void mouseReleaseEvent(QMouseEvent *event) override
         {
             ++mouseReleaseCount;
             QWidget::mouseReleaseEvent(event);
         }
-        void mouseMoveEvent(QMouseEvent *event)
+        void mouseMoveEvent(QMouseEvent *event) override
         {
             ++mouseMoveCount;
             QWidget::mouseMoveEvent(event);
diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
index 28731223a9..ad91cf3031 100644
--- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
@@ -212,7 +212,7 @@ public:
     QList<QWidget *> createdWidgets() const { return QWidgetAction::createdWidgets(); }
 
 protected:
-    virtual QWidget *createWidget(QWidget *parent);
+    virtual QWidget *createWidget(QWidget *parent) override;
 };
 
 QWidget *ComboAction::createWidget(QWidget *parent)
@@ -396,7 +396,7 @@ class CrashedAction : public QWidgetAction
 public:
     inline CrashedAction(QObject *parent) : QWidgetAction(parent) { }
 
-    virtual QWidget *createWidget(QWidget *parent) {
+    virtual QWidget *createWidget(QWidget *parent) override {
         return new QWidget(parent);
     }
 };
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index 2a8edaf1a2..ec646ccbe3 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -49,7 +49,8 @@ public:
     {
     }
 
-    void exposeEvent(QExposeEvent *) {
+    void exposeEvent(QExposeEvent *) override
+    {
         if (isExposed())
             ++numberOfExposes;
         else
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 71b8867d09..7272e53dc9 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -52,7 +52,7 @@ public:
         receivedOvershoot = false;
     }
 
-    bool event(QEvent *e)
+    bool event(QEvent *e) override
     {
         switch (e->type()) {
         case QEvent::Gesture:
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index e5a891912f..3b2bc1d126 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -103,7 +103,7 @@ class MyButton : public QAbstractButton
 {
 public:
     MyButton(QWidget *p = 0) : QAbstractButton(p) {}
-    void paintEvent(QPaintEvent *)
+    void paintEvent(QPaintEvent *) override
     {
         QPainter p(this);
         QRect r = rect();
@@ -124,7 +124,7 @@ public:
 #endif
         }
     }
-    QSize sizeHint() const
+    QSize sizeHint() const override
     {
         QSize sh(8, 8);
         if (!text().isEmpty())
@@ -139,7 +139,7 @@ private:
 
     int timerEvents;
 
-    void timerEvent(QTimerEvent *event)
+    void timerEvent(QTimerEvent *event) override
     {
         ++timerEvents;
         QAbstractButton::timerEvent(event);
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
index fd1e5c267d..86a5ebc114 100644
--- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -291,7 +291,7 @@ public:
         startTimer(2000);
     }
 
-    void timerEvent(QTimerEvent * /* event */)
+    void timerEvent(QTimerEvent * /* event */) override
     {
         // should not crash.
         (void)new QScrollArea(this);
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index dd8a3e5839..e3448fa93d 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -51,7 +51,7 @@ public:
     { }
 
 protected:
-    void focusInEvent(QFocusEvent *)
+    void focusInEvent(QFocusEvent *) override
     {
         QCoreApplication::postEvent(this, new QKeyEvent(QEvent::KeyPress,
                                                         Qt::Key_Down, Qt::NoModifier));
diff --git a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index a164be8712..d9cd5ad136 100644
--- a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
@@ -523,17 +523,17 @@ public:
     }
 
 protected:
-    void mousePressEvent(QMouseEvent*)
+    void mousePressEvent(QMouseEvent*) override
     {
         mousePressed = true;
     }
 
-    void mouseReleaseEvent(QMouseEvent*)
+    void mouseReleaseEvent(QMouseEvent*) override
     {
         mouseReleased = true;
     }
 
-    void mouseMoveEvent(QMouseEvent*)
+    void mouseMoveEvent(QMouseEvent*) override
     {
         mouseMoved = true;
     }
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index eb34a5ad4e..d4bc816ec0 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -391,7 +391,7 @@ void tst_QLabel::task226479_movieResize()
 {
     class Label : public QLabel {
         protected:
-            void paintEvent(QPaintEvent *e)
+            void paintEvent(QPaintEvent *e) override
             {
                 paintedRegion += e->region();
                 QLabel::paintEvent(e);
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 2367d56dad..87be592e2b 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -906,7 +906,7 @@ public:
         : QValidator(parent)
     {}
 
-    QValidator::State validate(QString &str, int &) const
+    QValidator::State validate(QString &str, int &) const override
     {
         const int s = str.size();
         if (s < chars) {
@@ -917,7 +917,7 @@ public:
         return Acceptable;
     }
 
-    void fixup(QString &str) const
+    void fixup(QString &str) const override
     {
         str = str.leftJustified(chars, 'X', true);
     }
@@ -1930,7 +1930,7 @@ void tst_QLineEdit::isReadOnly()
 class BlinkTestLineEdit : public QLineEdit
 {
 public:
-    void paintEvent(QPaintEvent *e)
+    void paintEvent(QPaintEvent *e) override
     {
         ++updates;
         QLineEdit::paintEvent(e);
@@ -2431,7 +2431,7 @@ void tst_QLineEdit::returnPressed()
 class QIntFixValidator : public QIntValidator {
 public:
     QIntFixValidator(int min, int max, QObject *parent) : QIntValidator(min, max, parent) {}
-    void fixup (QString &input) const {
+    void fixup (QString &input) const override {
         for (int i=0; i<input.length(); ++i)
             if (!input.at(i).isNumber()) {
                 input[(int)i] = QChar('0');
@@ -3149,7 +3149,7 @@ class InputMaskValidator : public QValidator
 {
 public:
     InputMaskValidator(QObject *parent, const char *name = 0) : QValidator(parent) { setObjectName(name); }
-    State validate(QString &text, int &pos) const
+    State validate(QString &text, int &pos) const override
     {
         InputMaskValidator *that = (InputMaskValidator *)this;
         that->validateText = text;
@@ -3219,7 +3219,7 @@ class LineEdit : public QLineEdit
 public:
     LineEdit() { state = Other; }
 
-    void keyPressEvent(QKeyEvent *e)
+    void keyPressEvent(QKeyEvent *e) override
     {
         QLineEdit::keyPressEvent(e);
         if (e->key() == Qt::Key_Enter) {
@@ -4048,7 +4048,7 @@ class UpdateRegionLineEdit : public QLineEdit
 public:
     QRegion updateRegion;
 protected:
-    void paintEvent(QPaintEvent *event)
+    void paintEvent(QPaintEvent *event) override
     {
         updateRegion = event->region();
     }
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 8def1a11fc..53dbf2012f 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -792,7 +792,7 @@ class MyChild : public QWidget
 {
 public:
     MyChild(QWidget *parent = 0) : QWidget(parent) {}
-    QSize sizeHint() const { return QSize(234, 123); }
+    QSize sizeHint() const override { return QSize(234, 123); }
 };
 
 void tst_QMdiArea::childSize()
@@ -866,8 +866,8 @@ class LargeWidget : public QWidget
 {
 public:
     LargeWidget(QWidget *parent = 0) : QWidget(parent) {}
-    QSize sizeHint() const { return QSize(1280, 1024); }
-    QSize minimumSizeHint() const { return QSize(300, 300); }
+    QSize sizeHint() const override { return QSize(1280, 1024); }
+    QSize minimumSizeHint() const override { return QSize(300, 300); }
 };
 
 // New tests
@@ -2051,7 +2051,7 @@ public:
     void clear() { _count = 0; }
 
 protected:
-    bool eventFilter(QObject *object, QEvent *event)
+    bool eventFilter(QObject *object, QEvent *event) override
     {
         if (event->type() == eventToSpy)
             ++_count;
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index fd7775d944..8121a3637f 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -260,7 +260,7 @@ void tst_QMdiSubWindow::minimumSizeHint()
     public:
         Widget() = default;
 
-        QSize minimumSizeHint() const
+        QSize minimumSizeHint() const override
         {
             return QSize(100, 100);
         }
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 783476cf67..81ec5c77d0 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -979,7 +979,7 @@ class Menu258920 : public QMenu
 {
     Q_OBJECT
 public slots:
-    void paintEvent(QPaintEvent *e)
+    void paintEvent(QPaintEvent *e) override
     {
         QMenu::paintEvent(e);
         painted = true;
@@ -1410,7 +1410,7 @@ void tst_QMenu::widgetActionTriggerClosesMenu()
         }
 
     protected:
-        QWidget *createWidget(QWidget *parent)
+        QWidget *createWidget(QWidget *parent) override
         {
             QPushButton *button = new QPushButton(QLatin1String("Button"), parent);
             connect(button, &QPushButton::clicked, this, &QAction::trigger);
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index d3b3f72367..e3812f16d0 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -222,18 +222,18 @@ public:
     inline QtTestDocumentLayout(QPlainTextEdit *edit, QTextDocument *doc, int &itCount)
         : QAbstractTextDocumentLayout(doc), useBiggerSize(false), ed(edit), iterationCounter(itCount) {}
 
-    virtual void draw(QPainter *, const QAbstractTextDocumentLayout::PaintContext &)  {}
+    virtual void draw(QPainter *, const QAbstractTextDocumentLayout::PaintContext &) override {}
 
-    virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const { return 0; }
+    virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override { return 0; }
 
-    virtual void documentChanged(int, int, int) {}
+    virtual void documentChanged(int, int, int) override {}
 
-    virtual int pageCount() const { return 1; }
+    virtual int pageCount() const override { return 1; }
 
-    virtual QSizeF documentSize() const { return usedSize; }
+    virtual QSizeF documentSize() const override { return usedSize; }
 
-    virtual QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); }
-    virtual QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); }
+    virtual QRectF frameBoundingRect(QTextFrame *) const override { return QRectF(); }
+    virtual QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); }
 
     bool useBiggerSize;
     QSize usedSize;
@@ -1104,15 +1104,15 @@ public:
     mutable int canInsertCallCount;
     mutable int insertCallCount;
 
-    virtual QMimeData *createMimeDataFromSelection() const {
+    virtual QMimeData *createMimeDataFromSelection() const override {
         createMimeDataCallCount++;
         return QPlainTextEdit::createMimeDataFromSelection();
     }
-    virtual bool canInsertFromMimeData(const QMimeData *source) const {
+    virtual bool canInsertFromMimeData(const QMimeData *source) const override {
         canInsertCallCount++;
         return QPlainTextEdit::canInsertFromMimeData(source);
     }
-    virtual void insertFromMimeData(const QMimeData *source) {
+    virtual void insertFromMimeData(const QMimeData *source) override {
         insertCallCount++;
         QPlainTextEdit::insertFromMimeData(source);
     }
@@ -1252,7 +1252,7 @@ public:
     bool resizeEventCalled;
 
 protected:
-    virtual void resizeEvent(QResizeEvent *e)
+    virtual void resizeEvent(QResizeEvent *e) override
     {
         QPlainTextEdit::resizeEvent(e);
         setPlainText("<img src=qtextbrowser-resizeevent.png width=" + QString::number(size().width()) + "><br>Size is " + QString::number(size().width()) + " x " + QString::number(size().height()));
diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
index a1097fa433..eb80460311 100644
--- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
@@ -145,7 +145,7 @@ void tst_QProgressBar::text()
 
 class ProgressBar : public QProgressBar
 {
-    void paintEvent(QPaintEvent *event)
+    void paintEvent(QPaintEvent *event) override
     {
         repainted = true;
         QProgressBar::paintEvent(event);