Replace Q_DECL_OVERRIDE with override where possible

Remaining uses of Q_DECL_OVERRIDE are in:

src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
  (definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

31 files changed, 306 insertions, 306 deletions

diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
index fea3a06cbd..fe669c8dec 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
@@ -61,7 +61,7 @@ class QDeviceDiscoveryDummy : public QDeviceDiscovery
 
 public:
     QDeviceDiscoveryDummy(QDeviceTypes types, QObject *parent = 0);
-    QStringList scanConnectedDevices() Q_DECL_OVERRIDE;
+    QStringList scanConnectedDevices() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h
index ab5a9c6f12..93110c3c55 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h
@@ -61,7 +61,7 @@ class QDeviceDiscoveryStatic : public QDeviceDiscovery
 
 public:
     QDeviceDiscoveryStatic(QDeviceTypes types, QObject *parent = 0);
-    QStringList scanConnectedDevices() Q_DECL_OVERRIDE;
+    QStringList scanConnectedDevices() override;
 
 private:
     bool checkDeviceType(const QString &device);
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
index 3c53ef3f17..28618d0b21 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
@@ -63,7 +63,7 @@ class QDeviceDiscoveryUDev : public QDeviceDiscovery
 public:
     QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent = 0);
     ~QDeviceDiscoveryUDev();
-    QStringList scanConnectedDevices() Q_DECL_OVERRIDE;
+    QStringList scanConnectedDevices() override;
 
 private slots:
     void handleUDevNotification();
diff --git a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
index 38370c0e62..eed8cd9dca 100644
--- a/src/platformsupport/eglconvenience/qeglpbuffer_p.h
+++ b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
@@ -63,8 +63,8 @@ public:
                 QEGLPlatformContext::Flags flags = 0);
     ~QEGLPbuffer();
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
-    bool isValid() const Q_DECL_OVERRIDE { return m_pbuffer != EGL_NO_SURFACE; }
+    QSurfaceFormat format() const override { return m_format; }
+    bool isValid() const override { return m_pbuffer != EGL_NO_SURFACE; }
 
     EGLSurface pbuffer() const { return m_pbuffer; }
 
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
index 9d41eecd99..d6cbbe4131 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
@@ -72,15 +72,15 @@ public:
                         Flags flags = 0);
     ~QEGLPlatformContext();
 
-    void initialize() Q_DECL_OVERRIDE;
-    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
-    void doneCurrent() Q_DECL_OVERRIDE;
-    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
-    QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
+    void initialize() override;
+    bool makeCurrent(QPlatformSurface *surface) override;
+    void doneCurrent() override;
+    void swapBuffers(QPlatformSurface *surface) override;
+    QFunctionPointer getProcAddress(const char *procName) override;
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE;
-    bool isSharing() const Q_DECL_OVERRIDE { return m_shareContext != EGL_NO_CONTEXT; }
-    bool isValid() const Q_DECL_OVERRIDE { return m_eglContext != EGL_NO_CONTEXT; }
+    QSurfaceFormat format() const override;
+    bool isSharing() const override { return m_shareContext != EGL_NO_CONTEXT; }
+    bool isValid() const override { return m_eglContext != EGL_NO_CONTEXT; }
 
     EGLContext eglContext() const;
     EGLDisplay eglDisplay() const;
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
index bed2532856..5930dc68e7 100644
--- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
+++ b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
@@ -67,7 +67,7 @@ public:
     explicit QPAEventDispatcherGlib(QObject *parent = 0);
     ~QPAEventDispatcherGlib();
 
-    bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE;
+    bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
     QEventLoop::ProcessEventsFlags m_flags;
 };
 
diff --git a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h
index 9a23b5c0bd..4ff047a60e 100644
--- a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h
+++ b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h
@@ -63,8 +63,8 @@ public:
 
     static const char *windowsMessageName(UINT msg);
 
-    bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE;
-    void sendPostedEvents() Q_DECL_OVERRIDE;
+    bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) override;
+    void sendPostedEvents() override;
 
 private:
     QEventLoop::ProcessEventsFlags m_flags;
diff --git a/src/platformsupport/fbconvenience/qfbbackingstore_p.h b/src/platformsupport/fbconvenience/qfbbackingstore_p.h
index c8dfe3489c..c4762c9327 100644
--- a/src/platformsupport/fbconvenience/qfbbackingstore_p.h
+++ b/src/platformsupport/fbconvenience/qfbbackingstore_p.h
@@ -66,10 +66,10 @@ public:
     QFbBackingStore(QWindow *window);
     ~QFbBackingStore();
 
-    QPaintDevice *paintDevice() Q_DECL_OVERRIDE { return &mImage; }
-    void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
+    QPaintDevice *paintDevice() override { return &mImage; }
+    void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
 
-    void resize(const QSize &size, const QRegion &region) Q_DECL_OVERRIDE;
+    void resize(const QSize &size, const QRegion &region) override;
 
     const QImage image();
     QImage toImage() const override;
@@ -77,8 +77,8 @@ public:
     void lock();
     void unlock();
 
-    void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
-    void endPaint() Q_DECL_OVERRIDE;
+    void beginPaint(const QRegion &) override;
+    void endPaint() override;
 
 protected:
     friend class QFbWindow;
diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h
index 1c27a941cc..eed615de36 100644
--- a/src/platformsupport/fbconvenience/qfbscreen_p.h
+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h
@@ -78,14 +78,14 @@ public:
 
     virtual bool initialize();
 
-    QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; }
-    int depth() const Q_DECL_OVERRIDE { return mDepth; }
-    QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; }
-    QSizeF physicalSize() const Q_DECL_OVERRIDE { return mPhysicalSize; }
-    QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return mCursor; }
+    QRect geometry() const override { return mGeometry; }
+    int depth() const override { return mDepth; }
+    QImage::Format format() const override { return mFormat; }
+    QSizeF physicalSize() const override { return mPhysicalSize; }
+    QPlatformCursor *cursor() const override { return mCursor; }
 
     QWindow *topWindow() const;
-    QWindow *topLevelAt(const QPoint & p) const Q_DECL_OVERRIDE;
+    QWindow *topLevelAt(const QPoint & p) const override;
 
     // compositor api
     virtual void addWindow(QFbWindow *window);
@@ -109,7 +109,7 @@ protected:
     virtual QRegion doRedraw();
 
     void initializeCompositor();
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 
     QFbWindow *windowForId(WId wid) const;
 
diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h
index 20bac46c69..76b34ce041 100644
--- a/src/platformsupport/fbconvenience/qfbwindow_p.h
+++ b/src/platformsupport/fbconvenience/qfbwindow_p.h
@@ -64,17 +64,17 @@ public:
     QFbWindow(QWindow *window);
     ~QFbWindow();
 
-    void raise() Q_DECL_OVERRIDE;
-    void lower() Q_DECL_OVERRIDE;
+    void raise() override;
+    void lower() override;
 
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void setGeometry(const QRect &rect) override;
+    void setVisible(bool visible) override;
 
-    void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE;
-    void setWindowFlags(Qt::WindowFlags type) Q_DECL_OVERRIDE;
+    void setWindowState(Qt::WindowStates state) override;
+    void setWindowFlags(Qt::WindowFlags type) override;
     Qt::WindowFlags windowFlags() const;
 
-    WId winId() const Q_DECL_OVERRIDE { return mWindowId; }
+    WId winId() const override { return mWindowId; }
 
     void setBackingStore(QFbBackingStore *store) { mBackingStore = store; }
     QFbBackingStore *backingStore() const { return mBackingStore; }
@@ -83,9 +83,9 @@ public:
 
     virtual void repaint(const QRegion&);
 
-    void propagateSizeHints() Q_DECL_OVERRIDE { }
-    bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; }
-    bool setMouseGrabEnabled(bool) Q_DECL_OVERRIDE { return false; }
+    void propagateSizeHints() override { }
+    bool setKeyboardGrabEnabled(bool) override { return false; }
+    bool setMouseGrabEnabled(bool) override { return false; }
 
 protected:
     friend class QFbScreen;
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
index 6a3261de30..a7257c2f98 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h
@@ -61,15 +61,15 @@ class QFontEngineFT;
 class QFontconfigDatabase : public QFreeTypeFontDatabase
 {
 public:
-    void populateFontDatabase() Q_DECL_OVERRIDE;
-    void invalidate() Q_DECL_OVERRIDE;
-    QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE;
-    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
-    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
-    QString resolveFontFamilyAlias(const QString &family) const Q_DECL_OVERRIDE;
-    QFont defaultFont() const Q_DECL_OVERRIDE;
+    void populateFontDatabase() override;
+    void invalidate() override;
+    QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) override;
+    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
+    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override;
+    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override;
+    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override;
+    QString resolveFontFamilyAlias(const QString &family) const override;
+    QFont defaultFont() const override;
 
 private:
     void setupFontEngine(QFontEngineFT *engine, const QFontDef &fontDef) const;
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
index 1d2f451722..7f560c2d05 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
@@ -63,7 +63,7 @@ public:
 
     ~QFontEngineMultiFontConfig();
 
-    bool shouldLoadFontEngineForCharacter(int at, uint ucs4) const Q_DECL_OVERRIDE;
+    bool shouldLoadFontEngineForCharacter(int at, uint ucs4) const override;
 private:
     FcPattern* getMatchPatternForFallback(int at) const;
 
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index 2993e3b616..7efd175402 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -190,68 +190,68 @@ private:
         mutable int fast_glyph_count;
     };
 
-    QFontEngine::FaceId faceId() const Q_DECL_OVERRIDE;
-    QFontEngine::Properties properties() const Q_DECL_OVERRIDE;
-    QFixed emSquareSize() const Q_DECL_OVERRIDE;
-    bool supportsSubPixelPositions() const Q_DECL_OVERRIDE
+    QFontEngine::FaceId faceId() const override;
+    QFontEngine::Properties properties() const override;
+    QFixed emSquareSize() const override;
+    bool supportsSubPixelPositions() const override
     {
         return default_hint_style == HintLight ||
                default_hint_style == HintNone;
     }
 
-    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
-    int synthesized() const Q_DECL_OVERRIDE;
+    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override;
+    int synthesized() const override;
 
-    QFixed ascent() const Q_DECL_OVERRIDE;
-    QFixed capHeight() const Q_DECL_OVERRIDE;
-    QFixed descent() const Q_DECL_OVERRIDE;
-    QFixed leading() const Q_DECL_OVERRIDE;
-    QFixed xHeight() const Q_DECL_OVERRIDE;
-    QFixed averageCharWidth() const Q_DECL_OVERRIDE;
+    QFixed ascent() const override;
+    QFixed capHeight() const override;
+    QFixed descent() const override;
+    QFixed leading() const override;
+    QFixed xHeight() const override;
+    QFixed averageCharWidth() const override;
 
-    qreal maxCharWidth() const Q_DECL_OVERRIDE;
-    QFixed lineThickness() const Q_DECL_OVERRIDE;
-    QFixed underlinePosition() const Q_DECL_OVERRIDE;
+    qreal maxCharWidth() const override;
+    QFixed lineThickness() const override;
+    QFixed underlinePosition() const override;
 
-    glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
-    void doKerning(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE;
+    glyph_t glyphIndex(uint ucs4) const override;
+    void doKerning(QGlyphLayout *, ShaperFlags) const override;
 
-    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
+    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) override;
 
-    bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
+    bool supportsTransformation(const QTransform &transform) const override;
 
     void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
-                 QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+                 QPainterPath *path, QTextItem::RenderFlags flags) override;
     void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs,
-                  QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+                  QPainterPath *path, QTextItem::RenderFlags flags) override;
 
-    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
+    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override;
 
-    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
-    glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE;
-    glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override;
+    glyph_metrics_t boundingBox(glyph_t glyph) override;
+    glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) override;
 
-    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
-    QImage alphaMapForGlyph(glyph_t g) Q_DECL_OVERRIDE { return alphaMapForGlyph(g, 0); }
-    QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE;
-    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
+    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const override;
+    QImage alphaMapForGlyph(glyph_t g) override { return alphaMapForGlyph(g, 0); }
+    QImage alphaMapForGlyph(glyph_t, QFixed) override;
+    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override;
+    QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override;
+    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override;
     glyph_metrics_t alphaMapBoundingBox(glyph_t glyph,
                                         QFixed subPixelPosition,
                                         const QTransform &matrix,
-                                        QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE;
+                                        QFontEngine::GlyphFormat format) override;
     QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition,
                                    GlyphFormat neededFormat, const QTransform &t,
-                                   QPoint *offset) Q_DECL_OVERRIDE;
-    bool hasInternalCaching() const Q_DECL_OVERRIDE { return cacheEnabled; }
-    void unlockAlphaMapForGlyph() Q_DECL_OVERRIDE;
-    bool expectsGammaCorrectedBlending() const Q_DECL_OVERRIDE;
+                                   QPoint *offset) override;
+    bool hasInternalCaching() const override { return cacheEnabled; }
+    void unlockAlphaMapForGlyph() override;
+    bool expectsGammaCorrectedBlending() const override;
 
-    void removeGlyphFromCache(glyph_t glyph) Q_DECL_OVERRIDE;
-    int glyphMargin(QFontEngine::GlyphFormat /* format */) Q_DECL_OVERRIDE { return 0; }
+    void removeGlyphFromCache(glyph_t glyph) override;
+    int glyphMargin(QFontEngine::GlyphFormat /* format */) override { return 0; }
 
-    int glyphCount() const Q_DECL_OVERRIDE;
+    int glyphCount() const override;
 
     enum Scaling {
         Scaled,
@@ -282,13 +282,13 @@ private:
     bool init(FaceId faceId, bool antialias, GlyphFormat format,
               QFreetypeFace *freetypeFace);
 
-    int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) Q_DECL_OVERRIDE;
+    int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) override;
 
     void setQtDefaultHintStyle(QFont::HintingPreference hintingPreference);
-    void setDefaultHintStyle(HintStyle style) Q_DECL_OVERRIDE;
+    void setDefaultHintStyle(HintStyle style) override;
 
-    QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
-    Qt::HANDLE handle() const Q_DECL_OVERRIDE;
+    QFontEngine *cloneWithSize(qreal pixelSize) const override;
+    Qt::HANDLE handle() const override;
     bool initFromFontEngine(const QFontEngineFT *fontEngine);
 
     HintStyle defaultHintStyle() const { return default_hint_style; }
diff --git a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h
index 6d51361400..0b2956b16e 100644
--- a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h
@@ -66,11 +66,11 @@ struct FontFile
 class QFreeTypeFontDatabase : public QPlatformFontDatabase
 {
 public:
-    void populateFontDatabase() Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE;
-    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
-    void releaseHandle(void *handle) Q_DECL_OVERRIDE;
+    void populateFontDatabase() override;
+    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
+    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override;
+    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override;
+    void releaseHandle(void *handle) override;
 
     static QStringList addTTFile(const QByteArray &fontData, const QByteArray &file);
 };
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index 2b4c4e3ceb..76ab31c046 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -70,18 +70,18 @@ class QCoreTextFontDatabase : public QPlatformFontDatabase
 public:
     QCoreTextFontDatabase();
     ~QCoreTextFontDatabase();
-    void populateFontDatabase() Q_DECL_OVERRIDE;
+    void populateFontDatabase() override;
     bool populateFamilyAliases() override;
-    void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
+    void populateFamily(const QString &familyName) override;
     void invalidate() override;
 
-    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
-    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
-    void releaseHandle(void *handle) Q_DECL_OVERRIDE;
-    bool isPrivateFontFamily(const QString &family) const Q_DECL_OVERRIDE;
-    QFont defaultFont() const Q_DECL_OVERRIDE;
-    bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
-    QList<int> standardSizes() const Q_DECL_OVERRIDE;
+    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override;
+    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override;
+    void releaseHandle(void *handle) override;
+    bool isPrivateFontFamily(const QString &family) const override;
+    QFont defaultFont() const override;
+    bool fontsAlwaysScalable() const override;
+    QList<int> standardSizes() const override;
 
     // For iOS and OS X platform themes
     QFont *themeFont(QPlatformTheme::Font) const;
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index 2986f0aaec..1f7b346909 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -70,53 +70,53 @@ public:
     QCoreTextFontEngine(CGFontRef font, const QFontDef &def);
     ~QCoreTextFontEngine();
 
-    glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
-    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
-    void recalcAdvances(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE;
+    glyph_t glyphIndex(uint ucs4) const override;
+    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override;
+    void recalcAdvances(QGlyphLayout *, ShaperFlags) const override;
 
-    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
-    glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override;
+    glyph_metrics_t boundingBox(glyph_t glyph) override;
 
-    QFixed ascent() const Q_DECL_OVERRIDE;
-    QFixed capHeight() const Q_DECL_OVERRIDE;
-    QFixed descent() const Q_DECL_OVERRIDE;
-    QFixed leading() const Q_DECL_OVERRIDE;
-    QFixed xHeight() const Q_DECL_OVERRIDE;
-    qreal maxCharWidth() const Q_DECL_OVERRIDE;
-    QFixed averageCharWidth() const Q_DECL_OVERRIDE;
+    QFixed ascent() const override;
+    QFixed capHeight() const override;
+    QFixed descent() const override;
+    QFixed leading() const override;
+    QFixed xHeight() const override;
+    qreal maxCharWidth() const override;
+    QFixed averageCharWidth() const override;
 
     void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs,
-                         QPainterPath *path, QTextItem::RenderFlags) Q_DECL_OVERRIDE;
+                         QPainterPath *path, QTextItem::RenderFlags) override;
 
-    bool canRender(const QChar *string, int len) const Q_DECL_OVERRIDE;
+    bool canRender(const QChar *string, int len) const override;
 
-    int synthesized() const Q_DECL_OVERRIDE { return synthesisFlags; }
-    bool supportsSubPixelPositions() const Q_DECL_OVERRIDE { return true; }
+    int synthesized() const override { return synthesisFlags; }
+    bool supportsSubPixelPositions() const override { return true; }
 
-    QFixed lineThickness() const Q_DECL_OVERRIDE;
-    QFixed underlinePosition() const Q_DECL_OVERRIDE;
+    QFixed lineThickness() const override;
+    QFixed underlinePosition() const override;
 
     void draw(CGContextRef ctx, qreal x, qreal y, const QTextItemInt &ti, int paintDeviceHeight);
 
-    FaceId faceId() const Q_DECL_OVERRIDE;
-    bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const Q_DECL_OVERRIDE;
-    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
-    QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition) Q_DECL_OVERRIDE;
-    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE;
-    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    QFixed emSquareSize() const Q_DECL_OVERRIDE;
-    void doKerning(QGlyphLayout *g, ShaperFlags flags) const Q_DECL_OVERRIDE;
-
-    bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
-    bool expectsGammaCorrectedBlending() const Q_DECL_OVERRIDE;
-
-    QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
-    Qt::HANDLE handle() const Q_DECL_OVERRIDE;
-    int glyphMargin(QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE { Q_UNUSED(format); return 0; }
-
-    QFontEngine::Properties properties() const Q_DECL_OVERRIDE;
+    FaceId faceId() const override;
+    bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const override;
+    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) override;
+    QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition) override;
+    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override;
+    QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override;
+    glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) override;
+    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override;
+    QFixed emSquareSize() const override;
+    void doKerning(QGlyphLayout *g, ShaperFlags flags) const override;
+
+    bool supportsTransformation(const QTransform &transform) const override;
+    bool expectsGammaCorrectedBlending() const override;
+
+    QFontEngine *cloneWithSize(qreal pixelSize) const override;
+    Qt::HANDLE handle() const override;
+    int glyphMargin(QFontEngine::GlyphFormat format) override { Q_UNUSED(format); return 0; }
+
+    QFontEngine::Properties properties() const override;
 
     static bool ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length);
     static QFont::Weight qtWeightFromCFWeight(float value);
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h
index 2df81274ad..c3d201b3a0 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h
@@ -60,18 +60,18 @@ QT_BEGIN_NAMESPACE
 class QWindowsFontDatabaseFT : public QFreeTypeFontDatabase
 {
 public:
-    void populateFontDatabase() Q_DECL_OVERRIDE;
-    void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
+    void populateFontDatabase() override;
+    void populateFamily(const QString &familyName) override;
+    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
     QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize,
-                            QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE;
+                            QFont::HintingPreference hintingPreference) override;
 
     QStringList fallbacksForFamily(const QString &family, QFont::Style style,
                                    QFont::StyleHint styleHint,
-                                   QChar::Script script) const Q_DECL_OVERRIDE;
+                                   QChar::Script script) const override;
 
-    QString fontDir() const Q_DECL_OVERRIDE;
-    QFont defaultFont() const Q_DECL_OVERRIDE;
+    QString fontDir() const override;
+    QFont defaultFont() const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index 15172c09da..bbdb90f70a 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -95,18 +95,18 @@ public:
     QWindowsFontDatabase();
     ~QWindowsFontDatabase();
 
-    void populateFontDatabase() Q_DECL_OVERRIDE;
-    void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
-    QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE;
-    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
-    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
-    void releaseHandle(void *handle) Q_DECL_OVERRIDE;
-    QString fontDir() const Q_DECL_OVERRIDE;
-
-    QFont defaultFont() const  Q_DECL_OVERRIDE { return systemDefaultFont(); }
-    bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
+    void populateFontDatabase() override;
+    void populateFamily(const QString &familyName) override;
+    QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) override;
+    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
+    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override;
+    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override;
+    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override;
+    void releaseHandle(void *handle) override;
+    QString fontDir() const override;
+
+    QFont defaultFont() const  override { return systemDefaultFont(); }
+    bool fontsAlwaysScalable() const override;
     void derefUniqueFont(const QString &uniqueFont);
     void refUniqueFont(const QString &uniqueFont);
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
index 76b45d7a7b..2ec391c4da 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
@@ -76,53 +76,53 @@ public:
     void initFontInfo(const QFontDef &request,
                       int dpi);
 
-    QFixed lineThickness() const Q_DECL_OVERRIDE;
-    Properties properties() const Q_DECL_OVERRIDE;
-    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
-    FaceId faceId() const Q_DECL_OVERRIDE;
-    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
-    int synthesized() const Q_DECL_OVERRIDE;
-    QFixed emSquareSize() const Q_DECL_OVERRIDE;
-
-    glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
-    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
-    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const Q_DECL_OVERRIDE;
-
-    void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+    QFixed lineThickness() const override;
+    Properties properties() const override;
+    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) override;
+    FaceId faceId() const override;
+    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override;
+    int synthesized() const override;
+    QFixed emSquareSize() const override;
+
+    glyph_t glyphIndex(uint ucs4) const override;
+    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override;
+    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const override;
+
+    void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) override;
     virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
-                         QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+                         QPainterPath *path, QTextItem::RenderFlags flags) override;
 
     HGDIOBJ selectDesignFont() const;
 
-    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
-    glyph_metrics_t boundingBox(glyph_t g) Q_DECL_OVERRIDE { return boundingBox(g, QTransform()); }
-    glyph_metrics_t boundingBox(glyph_t g, const QTransform &t) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override;
+    glyph_metrics_t boundingBox(glyph_t g) override { return boundingBox(g, QTransform()); }
+    glyph_metrics_t boundingBox(glyph_t g, const QTransform &t) override;
 
 
-    QFixed ascent() const Q_DECL_OVERRIDE;
-    QFixed descent() const Q_DECL_OVERRIDE;
-    QFixed leading() const Q_DECL_OVERRIDE;
-    QFixed xHeight() const Q_DECL_OVERRIDE;
-    QFixed capHeight() const Q_DECL_OVERRIDE;
-    QFixed averageCharWidth() const Q_DECL_OVERRIDE;
-    qreal maxCharWidth() const Q_DECL_OVERRIDE;
-    qreal minLeftBearing() const Q_DECL_OVERRIDE;
-    qreal minRightBearing() const Q_DECL_OVERRIDE;
+    QFixed ascent() const override;
+    QFixed descent() const override;
+    QFixed leading() const override;
+    QFixed xHeight() const override;
+    QFixed capHeight() const override;
+    QFixed averageCharWidth() const override;
+    qreal maxCharWidth() const override;
+    qreal minLeftBearing() const override;
+    qreal minRightBearing() const override;
 
-    QImage alphaMapForGlyph(glyph_t t) Q_DECL_OVERRIDE { return alphaMapForGlyph(t, QTransform()); }
-    QImage alphaMapForGlyph(glyph_t, const QTransform &xform) Q_DECL_OVERRIDE;
-    QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) Q_DECL_OVERRIDE;
-    glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE;
+    QImage alphaMapForGlyph(glyph_t t) override { return alphaMapForGlyph(t, QTransform()); }
+    QImage alphaMapForGlyph(glyph_t, const QTransform &xform) override;
+    QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) override;
+    glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) override;
 
-    QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
-    Qt::HANDLE handle() const Q_DECL_OVERRIDE;
-    bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
+    QFontEngine *cloneWithSize(qreal pixelSize) const override;
+    Qt::HANDLE handle() const override;
+    bool supportsTransformation(const QTransform &transform) const override;
 
 #ifndef Q_CC_MINGW
-    void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) Q_DECL_OVERRIDE;
+    void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override;
 #endif
 
-    bool hasUnreliableGlyphOutline() const Q_DECL_OVERRIDE;
+    bool hasUnreliableGlyphOutline() const override;
 
     int getGlyphIndexes(const QChar *ch, int numChars, QGlyphLayout *glyphs) const;
     void getCMap();
@@ -173,7 +173,7 @@ class QWindowsMultiFontEngine : public QFontEngineMulti
 public:
     explicit QWindowsMultiFontEngine(QFontEngine *fe, int script);
 
-    QFontEngine *loadEngine(int at) Q_DECL_OVERRIDE;
+    QFontEngine *loadEngine(int at) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
index db4e79e44f..83fdddfa26 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
@@ -80,41 +80,41 @@ public:
 
     void initFontInfo(const QFontDef &request, int dpi);
 
-    QFixed lineThickness() const Q_DECL_OVERRIDE;
-    QFixed underlinePosition() const Q_DECL_OVERRIDE;
-    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
-    QFixed emSquareSize() const Q_DECL_OVERRIDE;
+    QFixed lineThickness() const override;
+    QFixed underlinePosition() const override;
+    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override;
+    QFixed emSquareSize() const override;
 
-    glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
+    glyph_t glyphIndex(uint ucs4) const override;
     bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs,
-                      ShaperFlags flags) const Q_DECL_OVERRIDE;
-    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const Q_DECL_OVERRIDE;
+                      ShaperFlags flags) const override;
+    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const override;
 
     void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
-                         QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+                         QPainterPath *path, QTextItem::RenderFlags flags) override;
 
-    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
-    glyph_metrics_t boundingBox(glyph_t g) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override;
+    glyph_metrics_t boundingBox(glyph_t g) override;
     glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed,
-                                        const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE;
+                                        const QTransform &matrix, GlyphFormat) override;
 
-    QFixed ascent() const Q_DECL_OVERRIDE;
-    QFixed capHeight() const Q_DECL_OVERRIDE;
-    QFixed descent() const Q_DECL_OVERRIDE;
-    QFixed leading() const Q_DECL_OVERRIDE;
-    QFixed xHeight() const Q_DECL_OVERRIDE;
-    qreal maxCharWidth() const Q_DECL_OVERRIDE;
-    FaceId faceId() const Q_DECL_OVERRIDE;
+    QFixed ascent() const override;
+    QFixed capHeight() const override;
+    QFixed descent() const override;
+    QFixed leading() const override;
+    QFixed xHeight() const override;
+    qreal maxCharWidth() const override;
+    FaceId faceId() const override;
 
-    bool supportsSubPixelPositions() const Q_DECL_OVERRIDE;
+    bool supportsSubPixelPositions() const override;
 
-    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE;
-    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) Q_DECL_OVERRIDE;
-    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
+    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition) override;
+    QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override;
+    QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) override;
+    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override;
 
-    QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
-    Qt::HANDLE handle() const Q_DECL_OVERRIDE;
+    QFontEngine *cloneWithSize(qreal pixelSize) const override;
+    Qt::HANDLE handle() const override;
 
     const QSharedPointer<QWindowsFontEngineData> &fontEngineData() const { return m_fontEngineData; }
 
diff --git a/src/platformsupport/graphics/qrasterbackingstore_p.h b/src/platformsupport/graphics/qrasterbackingstore_p.h
index 2764fd6432..357e861d1d 100644
--- a/src/platformsupport/graphics/qrasterbackingstore_p.h
+++ b/src/platformsupport/graphics/qrasterbackingstore_p.h
@@ -62,12 +62,12 @@ public:
     QRasterBackingStore(QWindow *window);
     ~QRasterBackingStore();
 
-    void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
-    bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE;
-    void beginPaint(const QRegion &region) Q_DECL_OVERRIDE;
+    void resize(const QSize &size, const QRegion &staticContents) override;
+    bool scroll(const QRegion &area, int dx, int dy) override;
+    void beginPaint(const QRegion &region) override;
 
-    QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
-    QImage toImage() const Q_DECL_OVERRIDE;
+    QPaintDevice *paintDevice() override;
+    QImage toImage() const override;
 
 protected:
     virtual QImage::Format format() const;
diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
index 20dfda89f7..cd760ba40a 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
@@ -88,7 +88,7 @@ class QEvdevTabletHandlerThread : public QDaemonThread
 public:
     explicit QEvdevTabletHandlerThread(const QString &device, const QString &spec, QObject *parent = 0);
     ~QEvdevTabletHandlerThread();
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
     QEvdevTabletHandler *handler() { return m_handler; }
 
 private:
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h b/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h
index d22aca3266..b93744815c 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h
@@ -110,11 +110,11 @@ class QEvdevTouchScreenHandlerThread : public QDaemonThread
 public:
     explicit QEvdevTouchScreenHandlerThread(const QString &device, const QString &spec, QObject *parent = Q_NULLPTR);
     ~QEvdevTouchScreenHandlerThread();
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
     bool isTouchDeviceRegistered() const;
 
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
 
 public slots:
     void scheduleTouchPointUpdate();
diff --git a/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp b/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp
index 8089a6e38b..e472693077 100644
--- a/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp
+++ b/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp
@@ -75,8 +75,8 @@ public:
     {
         CheckSuccess(gh_hid_close(handle));
     };
-    void process_event(void) Q_DECL_OVERRIDE;
-    void async_wait(void) Q_DECL_OVERRIDE;
+    void process_event(void) override;
+    void async_wait(void) override;
     HIDDriver *get_driver(void) { return driver; };
     HIDHandle get_handle(void) { return handle; };
 private:
@@ -94,8 +94,8 @@ public:
     {
         qDeleteAll(devices);
     };
-    void process_event(void) Q_DECL_OVERRIDE;
-    void async_wait(void) Q_DECL_OVERRIDE;
+    void process_event(void) override;
+    void async_wait(void) override;
     void find_devices(void);
 private:
     QHash<Value, HIDDeviceHandler *> devices;
diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h
index 1e435ca351..c48bbd3710 100644
--- a/src/platformsupport/linuxaccessibility/bridge_p.h
+++ b/src/platformsupport/linuxaccessibility/bridge_p.h
@@ -74,7 +74,7 @@ public:
 
     virtual ~QSpiAccessibleBridge();
 
-    void notifyAccessibilityUpdate(QAccessibleEvent *event) Q_DECL_OVERRIDE;
+    void notifyAccessibilityUpdate(QAccessibleEvent *event) override;
     QDBusConnection dBusConnection() const;
 
 public Q_SLOTS:
diff --git a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h b/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
index 0b025e4304..efba688c13 100644
--- a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
+++ b/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
@@ -66,17 +66,17 @@ public:
     QOpenGLCompositorBackingStore(QWindow *window);
     ~QOpenGLCompositorBackingStore();
 
-    QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
+    QPaintDevice *paintDevice() override;
 
-    void beginPaint(const QRegion &region) Q_DECL_OVERRIDE;
+    void beginPaint(const QRegion &region) override;
 
-    void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
-    void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
+    void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
+    void resize(const QSize &size, const QRegion &staticContents) override;
 
-    QImage toImage() const Q_DECL_OVERRIDE;
+    QImage toImage() const override;
     void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
                          QPlatformTextureList *textures, QOpenGLContext *context,
-                         bool translucentBackground) Q_DECL_OVERRIDE;
+                         bool translucentBackground) override;
 
     const QPlatformTextureList *textures() const { return m_textures; }
 
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
index 205b2e6160..8ac3de6f03 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
@@ -61,10 +61,10 @@ class QGenericUnixServices : public QPlatformServices
 public:
     QGenericUnixServices() {}
 
-    QByteArray desktopEnvironment() const Q_DECL_OVERRIDE;
+    QByteArray desktopEnvironment() const override;
 
-    bool openUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool openDocument(const QUrl &url) Q_DECL_OVERRIDE;
+    bool openUrl(const QUrl &url) override;
+    bool openDocument(const QUrl &url) override;
 
 private:
     QString m_webBrowser;
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
index 8266a395f5..364e7da4b6 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
@@ -67,12 +67,12 @@ public:
     QDBusMenuBar();
     virtual ~QDBusMenuBar();
 
-    void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) Q_DECL_OVERRIDE;
-    void removeMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    void syncMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    void handleReparent(QWindow *newParentWindow) Q_DECL_OVERRIDE;
-    QPlatformMenu *menuForTag(quintptr tag) const Q_DECL_OVERRIDE;
-    QPlatformMenu *createMenu() const Q_DECL_OVERRIDE;
+    void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override;
+    void removeMenu(QPlatformMenu *menu) override;
+    void syncMenu(QPlatformMenu *menu) override;
+    void handleReparent(QWindow *newParentWindow) override;
+    QPlatformMenu *menuForTag(quintptr tag) const override;
+    QPlatformMenu *createMenu() const override;
 
 private:
     QDBusPlatformMenu *m_menu;
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
index 5458e2fdd5..8a31f82fb0 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
@@ -77,31 +77,31 @@ public:
     ~QDBusPlatformMenuItem();
 
     const QString text() const { return m_text; }
-    void setText(const QString &text) Q_DECL_OVERRIDE;
+    void setText(const QString &text) override;
     QIcon icon() const { return m_icon; }
-    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
+    void setIcon(const QIcon &icon) override;
     const QPlatformMenu *menu() const { return m_subMenu; }
-    void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
+    void setMenu(QPlatformMenu *menu) override;
     bool isEnabled() const { return m_isEnabled; }
-    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
+    void setEnabled(bool enabled) override;
     bool isVisible() const { return m_isVisible; }
-    void setVisible(bool isVisible) Q_DECL_OVERRIDE;
+    void setVisible(bool isVisible) override;
     bool isSeparator() const { return m_isSeparator; }
-    void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE;
-    void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); }
-    void setRole(MenuRole role) Q_DECL_OVERRIDE;
+    void setIsSeparator(bool isSeparator) override;
+    void setFont(const QFont &font) override { Q_UNUSED(font); }
+    void setRole(MenuRole role) override;
     bool isCheckable() const { return m_isCheckable; }
-    void setCheckable(bool checkable) Q_DECL_OVERRIDE;
+    void setCheckable(bool checkable) override;
     bool isChecked() const { return m_isChecked; }
-    void setChecked(bool isChecked) Q_DECL_OVERRIDE;
+    void setChecked(bool isChecked) override;
     bool hasExclusiveGroup() const { return m_hasExclusiveGroup; }
-    void setHasExclusiveGroup(bool hasExclusiveGroup) Q_DECL_OVERRIDE;
+    void setHasExclusiveGroup(bool hasExclusiveGroup) override;
 #ifndef QT_NO_SHORTCUT
     QKeySequence shortcut() const { return m_shortcut; }
-    void setShortcut(const QKeySequence& shortcut) Q_DECL_OVERRIDE;
+    void setShortcut(const QKeySequence& shortcut) override;
 #endif
-    void setIconSize(int size) Q_DECL_OVERRIDE { Q_UNUSED(size); }
-    void setNativeContents(WId item) Q_DECL_OVERRIDE { Q_UNUSED(item); }
+    void setIconSize(int size) override { Q_UNUSED(size); }
+    void setNativeContents(WId item) override { Q_UNUSED(item); }
 
     int dbusID() const { return m_dbusID; }
 
@@ -133,35 +133,35 @@ class QDBusPlatformMenu : public QPlatformMenu
 public:
     QDBusPlatformMenu();
     ~QDBusPlatformMenu();
-    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE;
-    void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
+    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override;
+    void removeMenuItem(QPlatformMenuItem *menuItem) override;
     void syncSubMenu(const QDBusPlatformMenu *menu);
-    void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
-    void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE { Q_UNUSED(enable); }
+    void syncMenuItem(QPlatformMenuItem *menuItem) override;
+    void syncSeparatorsCollapsible(bool enable) override { Q_UNUSED(enable); }
 
     const QString text() const { return m_text; }
-    void setText(const QString &text) Q_DECL_OVERRIDE;
+    void setText(const QString &text) override;
     QIcon icon() const { return m_icon; }
-    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    bool isEnabled() const Q_DECL_OVERRIDE { return m_isEnabled; }
-    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
+    void setIcon(const QIcon &icon) override;
+    bool isEnabled() const override { return m_isEnabled; }
+    void setEnabled(bool enabled) override;
     bool isVisible() const { return m_isVisible; }
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setMinimumWidth(int width) Q_DECL_OVERRIDE { Q_UNUSED(width); }
-    void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); }
-    void setMenuType(MenuType type) Q_DECL_OVERRIDE { Q_UNUSED(type); }
+    void setVisible(bool visible) override;
+    void setMinimumWidth(int width) override { Q_UNUSED(width); }
+    void setFont(const QFont &font) override { Q_UNUSED(font); }
+    void setMenuType(MenuType type) override { Q_UNUSED(type); }
     void setContainingMenuItem(QDBusPlatformMenuItem *item);
 
-    void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE;
+    void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override;
 
-    void dismiss() Q_DECL_OVERRIDE { } // Closes this and all its related menu popups
+    void dismiss() override { } // Closes this and all its related menu popups
 
-    QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE;
-    QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE;
+    QPlatformMenuItem *menuItemAt(int position) const override;
+    QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
     const QList<QDBusPlatformMenuItem *> items() const;
 
-    QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE;
-    QPlatformMenu *createSubMenu() const Q_DECL_OVERRIDE;
+    QPlatformMenuItem *createMenuItem() const override;
+    QPlatformMenu *createSubMenu() const override;
 
     uint revision() const { return m_revision; }
 
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
index 4c9bc8f7e3..7034a7edb4 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
@@ -91,18 +91,18 @@ public:
 
     QDBusMenuConnection * dBusConnection();
 
-    void init() Q_DECL_OVERRIDE;
-    void cleanup() Q_DECL_OVERRIDE;
-    void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE;
-    void updateToolTip(const QString &tooltip) Q_DECL_OVERRIDE;
-    void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE;
-    QPlatformMenu *createMenu() const Q_DECL_OVERRIDE;
+    void init() override;
+    void cleanup() override;
+    void updateIcon(const QIcon &icon) override;
+    void updateToolTip(const QString &tooltip) override;
+    void updateMenu(QPlatformMenu *menu) override;
+    QPlatformMenu *createMenu() const override;
     void showMessage(const QString &title, const QString &msg,
-                     const QIcon &icon, MessageIcon iconType, int msecs) Q_DECL_OVERRIDE;
+                     const QIcon &icon, MessageIcon iconType, int msecs) override;
 
-    bool isSystemTrayAvailable() const Q_DECL_OVERRIDE;
-    bool supportsMessages() const Q_DECL_OVERRIDE { return true; }
-    QRect geometry() const Q_DECL_OVERRIDE { return QRect(); }
+    bool isSystemTrayAvailable() const override;
+    bool supportsMessages() const override { return true; }
+    QRect geometry() const override { return QRect(); }
 
     QString category() const { return m_category; }
     QString status() const { return m_status; }
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index da13390662..186e5a7dff 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -81,15 +81,15 @@ public:
     static QPlatformTheme *createUnixTheme(const QString &name);
     static QStringList themeNames();
 
-    const QFont *font(Font type) const Q_DECL_OVERRIDE;
-    QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
+    const QFont *font(Font type) const override;
+    QVariant themeHint(ThemeHint hint) const override;
 
     static QStringList xdgIconThemePaths();
 #ifndef QT_NO_DBUS
-    QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE;
+    QPlatformMenuBar *createPlatformMenuBar() const override;
 #endif
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
+    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
 #endif
 
     static const char *name;
@@ -105,19 +105,19 @@ public:
     QKdeTheme(const QStringList& kdeDirs, int kdeVersion);
 
     static QPlatformTheme *createKdeTheme();
-    QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
+    QVariant themeHint(ThemeHint hint) const override;
 
     QIcon fileIcon(const QFileInfo &fileInfo,
                    QPlatformTheme::IconOptions iconOptions = 0) const override;
 
-    const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
+    const QPalette *palette(Palette type = SystemPalette) const override;
 
-    const QFont *font(Font type) const Q_DECL_OVERRIDE;
+    const QFont *font(Font type) const override;
 #ifndef QT_NO_DBUS
-    QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE;
+    QPlatformMenuBar *createPlatformMenuBar() const override;
 #endif
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
+    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
 #endif
 
     static const char *name;
@@ -131,18 +131,18 @@ class QGnomeTheme : public QPlatformTheme
     Q_DECLARE_PRIVATE(QGnomeTheme)
 public:
     QGnomeTheme();
-    QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
+    QVariant themeHint(ThemeHint hint) const override;
     QIcon fileIcon(const QFileInfo &fileInfo,
                    QPlatformTheme::IconOptions = 0) const override;
-    const QFont *font(Font type) const Q_DECL_OVERRIDE;
-    QString standardButtonText(int button) const Q_DECL_OVERRIDE;
+    const QFont *font(Font type) const override;
+    QString standardButtonText(int button) const override;
 
     virtual QString gtkFontName() const;
 #ifndef QT_NO_DBUS
-    QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE;
+    QPlatformMenuBar *createPlatformMenuBar() const override;
 #endif
 #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
+    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
 #endif
 
     static const char *name;