Replace Q_DECL_OVERRIDE with override

Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

95 files changed, 645 insertions, 645 deletions

diff --git a/examples/multimedia/video/qmlvideofilter_opencl/main.cpp b/examples/multimedia/video/qmlvideofilter_opencl/main.cpp
index df8222432..cf2fcbd7b 100644
--- a/examples/multimedia/video/qmlvideofilter_opencl/main.cpp
+++ b/examples/multimedia/video/qmlvideofilter_opencl/main.cpp
@@ -88,7 +88,7 @@ public:
     qreal factor() const { return m_factor; }
     void setFactor(qreal v);
 
-    QVideoFilterRunnable *createFilterRunnable() Q_DECL_OVERRIDE;
+    QVideoFilterRunnable *createFilterRunnable() override;
 
 signals:
     void factorChanged();
@@ -102,7 +102,7 @@ class CLFilterRunnable : public QVideoFilterRunnable
 public:
     CLFilterRunnable(CLFilter *filter);
     ~CLFilterRunnable();
-    QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) Q_DECL_OVERRIDE;
+    QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) override;
 
 private:
     void releaseTextures();
@@ -423,7 +423,7 @@ class InfoFilter : public QAbstractVideoFilter
     Q_OBJECT
 
 public:
-    QVideoFilterRunnable *createFilterRunnable() Q_DECL_OVERRIDE;
+    QVideoFilterRunnable *createFilterRunnable() override;
 
 signals:
     void finished(QObject *result);
@@ -436,7 +436,7 @@ class InfoFilterRunnable : public QVideoFilterRunnable
 {
 public:
     InfoFilterRunnable(InfoFilter *filter) : m_filter(filter) { }
-    QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) Q_DECL_OVERRIDE;
+    QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) override;
 
 private:
     InfoFilter *m_filter;
diff --git a/src/imports/audioengine/qaudioengine_openal_p.h b/src/imports/audioengine/qaudioengine_openal_p.h
index c1dbf6aa2..92735ba86 100644
--- a/src/imports/audioengine/qaudioengine_openal_p.h
+++ b/src/imports/audioengine/qaudioengine_openal_p.h
@@ -91,12 +91,12 @@ public:
     StaticSoundBufferAL(QObject *parent, const QUrl &url, QSampleCache *sampleLoader);
     ~StaticSoundBufferAL();
 
-    State state() const Q_DECL_OVERRIDE;
+    State state() const override;
 
-    void load() Q_DECL_OVERRIDE;
+    void load() override;
 
-    void bindToSource(ALuint alSource) Q_DECL_OVERRIDE;
-    void unbindFromSource(ALuint alSource) Q_DECL_OVERRIDE;
+    void bindToSource(ALuint alSource) override;
+    void unbindFromSource(ALuint alSource) override;
 
     inline long addRef() { return ++m_ref; }
     inline long release() { return --m_ref; }
diff --git a/src/plugins/alsa/qalsaplugin.h b/src/plugins/alsa/qalsaplugin.h
index b3c530f88..cebede13b 100644
--- a/src/plugins/alsa/qalsaplugin.h
+++ b/src/plugins/alsa/qalsaplugin.h
@@ -56,11 +56,11 @@ public:
     QAlsaPlugin(QObject *parent = 0);
     ~QAlsaPlugin() {}
 
-    QByteArray defaultDevice(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QList<QByteArray> availableDevices(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QAbstractAudioInput *createInput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioOutput *createOutput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(QAudio::Mode mode) const override;
+    QList<QByteArray> availableDevices(QAudio::Mode mode) const override;
+    QAbstractAudioInput *createInput(const QByteArray &device) override;
+    QAbstractAudioOutput *createOutput(const QByteArray &device) override;
+    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/android/src/common/qandroidvideooutput.h b/src/plugins/android/src/common/qandroidvideooutput.h
index 936e4c40b..62a936881 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.h
+++ b/src/plugins/android/src/common/qandroidvideooutput.h
@@ -93,19 +93,19 @@ class QAndroidTextureVideoOutput : public QAndroidVideoOutput
     Q_OBJECT
 public:
     explicit QAndroidTextureVideoOutput(QObject *parent = 0);
-    ~QAndroidTextureVideoOutput() Q_DECL_OVERRIDE;
+    ~QAndroidTextureVideoOutput() override;
 
     QAbstractVideoSurface *surface() const;
     void setSurface(QAbstractVideoSurface *surface);
 
-    AndroidSurfaceTexture *surfaceTexture() Q_DECL_OVERRIDE;
+    AndroidSurfaceTexture *surfaceTexture() override;
 
-    bool isReady() Q_DECL_OVERRIDE;
-    void setVideoSize(const QSize &) Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
+    bool isReady() override;
+    void setVideoSize(const QSize &) override;
+    void stop() override;
+    void reset() override;
 
-    void customEvent(QEvent *) Q_DECL_OVERRIDE;
+    void customEvent(QEvent *) override;
 
 private Q_SLOTS:
     void onFrameAvailable();
diff --git a/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h b/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h
index b94964be0..e68bf6ef7 100644
--- a/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h
@@ -52,11 +52,11 @@ class QAndroidAudioEncoderSettingsControl : public QAudioEncoderSettingsControl
 public:
     explicit QAndroidAudioEncoderSettingsControl(QAndroidCaptureSession *session);
 
-    QStringList supportedAudioCodecs() const Q_DECL_OVERRIDE;
-    QString codecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QAudioEncoderSettings audioSettings() const Q_DECL_OVERRIDE;
-    void setAudioSettings(const QAudioEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedAudioCodecs() const override;
+    QString codecDescription(const QString &codecName) const override;
+    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const override;
+    QAudioEncoderSettings audioSettings() const override;
+    void setAudioSettings(const QAudioEncoderSettings &settings) override;
 
 private:
     QAndroidCaptureSession *m_session;
diff --git a/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.h b/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.h
index 3572b126d..b27727543 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameracapturebufferformatcontrol.h
@@ -50,9 +50,9 @@ class QAndroidCameraCaptureBufferFormatControl : public QCameraCaptureBufferForm
 public:
     QAndroidCameraCaptureBufferFormatControl();
 
-    QList<QVideoFrame::PixelFormat> supportedBufferFormats() const Q_DECL_OVERRIDE;
-    QVideoFrame::PixelFormat bufferFormat() const Q_DECL_OVERRIDE;
-    void setBufferFormat(QVideoFrame::PixelFormat format) Q_DECL_OVERRIDE;
+    QList<QVideoFrame::PixelFormat> supportedBufferFormats() const override;
+    QVideoFrame::PixelFormat bufferFormat() const override;
+    void setBufferFormat(QVideoFrame::PixelFormat format) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidcameracapturedestinationcontrol.h b/src/plugins/android/src/mediacapture/qandroidcameracapturedestinationcontrol.h
index 656aa2ced..1edfdab12 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameracapturedestinationcontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameracapturedestinationcontrol.h
@@ -52,9 +52,9 @@ class QAndroidCameraCaptureDestinationControl : public QCameraCaptureDestination
 public:
     explicit QAndroidCameraCaptureDestinationControl(QAndroidCameraSession *session);
 
-    bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const Q_DECL_OVERRIDE;
-    QCameraImageCapture::CaptureDestinations captureDestination() const Q_DECL_OVERRIDE;
-    void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) Q_DECL_OVERRIDE;
+    bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const override;
+    QCameraImageCapture::CaptureDestinations captureDestination() const override;
+    void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) override;
 
 private:
     QAndroidCameraSession *m_session;
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h b/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h
index e6b7fda8b..e87e6cd3a 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h
@@ -52,12 +52,12 @@ class QAndroidCameraExposureControl : public QCameraExposureControl
 public:
     explicit QAndroidCameraExposureControl(QAndroidCameraSession *session);
 
-    bool isParameterSupported(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const Q_DECL_OVERRIDE;
+    bool isParameterSupported(ExposureParameter parameter) const override;
+    QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const override;
 
-    QVariant requestedValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    QVariant actualValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    bool setValue(ExposureParameter parameter, const QVariant& value) Q_DECL_OVERRIDE;
+    QVariant requestedValue(ExposureParameter parameter) const override;
+    QVariant actualValue(ExposureParameter parameter) const override;
+    bool setValue(ExposureParameter parameter, const QVariant& value) override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.h b/src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.h
index 7a0015eaf..071c45c72 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameraflashcontrol.h
@@ -52,10 +52,10 @@ class QAndroidCameraFlashControl : public QCameraFlashControl
 public:
     explicit QAndroidCameraFlashControl(QAndroidCameraSession *session);
 
-    QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE;
-    void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE;
-    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE;
-    bool isFlashReady() const Q_DECL_OVERRIDE;
+    QCameraExposure::FlashModes flashMode() const override;
+    void setFlashMode(QCameraExposure::FlashModes mode) override;
+    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override;
+    bool isFlashReady() const override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h
index a3ba089da..9c606cf7d 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h
@@ -52,15 +52,15 @@ class QAndroidCameraFocusControl : public QCameraFocusControl
 public:
     explicit QAndroidCameraFocusControl(QAndroidCameraSession *session);
 
-    QCameraFocus::FocusModes focusMode() const Q_DECL_OVERRIDE;
-    void setFocusMode(QCameraFocus::FocusModes mode) Q_DECL_OVERRIDE;
-    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const Q_DECL_OVERRIDE;
-    QCameraFocus::FocusPointMode focusPointMode() const Q_DECL_OVERRIDE;
-    void setFocusPointMode(QCameraFocus::FocusPointMode mode) Q_DECL_OVERRIDE;
-    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Q_DECL_OVERRIDE;
-    QPointF customFocusPoint() const Q_DECL_OVERRIDE;
-    void setCustomFocusPoint(const QPointF &point) Q_DECL_OVERRIDE;
-    QCameraFocusZoneList focusZones() const Q_DECL_OVERRIDE;
+    QCameraFocus::FocusModes focusMode() const override;
+    void setFocusMode(QCameraFocus::FocusModes mode) override;
+    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override;
+    QCameraFocus::FocusPointMode focusPointMode() const override;
+    void setFocusPointMode(QCameraFocus::FocusPointMode mode) override;
+    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const override;
+    QPointF customFocusPoint() const override;
+    void setCustomFocusPoint(const QPointF &point) override;
+    QCameraFocusZoneList focusZones() const override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h b/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h
index 720eed748..cfe748c39 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h
@@ -52,13 +52,13 @@ class QAndroidCameraImageCaptureControl : public QCameraImageCaptureControl
 public:
     explicit QAndroidCameraImageCaptureControl(QAndroidCameraSession *session);
 
-    bool isReadyForCapture() const Q_DECL_OVERRIDE;
+    bool isReadyForCapture() const override;
 
-    QCameraImageCapture::DriveMode driveMode() const Q_DECL_OVERRIDE;
-    void setDriveMode(QCameraImageCapture::DriveMode mode) Q_DECL_OVERRIDE;
+    QCameraImageCapture::DriveMode driveMode() const override;
+    void setDriveMode(QCameraImageCapture::DriveMode mode) override;
 
-    int capture(const QString &fileName) Q_DECL_OVERRIDE;
-    void cancelCapture() Q_DECL_OVERRIDE;
+    int capture(const QString &fileName) override;
+    void cancelCapture() override;
 
 private:
     QAndroidCameraSession *m_session;
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h b/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h
index 8a750864a..9845c80dc 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h
@@ -52,10 +52,10 @@ class QAndroidCameraImageProcessingControl : public QCameraImageProcessingContro
 public:
     explicit QAndroidCameraImageProcessingControl(QAndroidCameraSession *session);
 
-    bool isParameterSupported(ProcessingParameter) const Q_DECL_OVERRIDE;
-    bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const Q_DECL_OVERRIDE;
-    QVariant parameter(ProcessingParameter parameter) const Q_DECL_OVERRIDE;
-    void setParameter(ProcessingParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isParameterSupported(ProcessingParameter) const override;
+    bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const override;
+    QVariant parameter(ProcessingParameter parameter) const override;
+    void setParameter(ProcessingParameter parameter, const QVariant &value) override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidcameralockscontrol.h b/src/plugins/android/src/mediacapture/qandroidcameralockscontrol.h
index e0a224b6e..149da0f32 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameralockscontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameralockscontrol.h
@@ -53,10 +53,10 @@ class QAndroidCameraLocksControl : public QCameraLocksControl
 public:
     explicit QAndroidCameraLocksControl(QAndroidCameraSession *session);
 
-    QCamera::LockTypes supportedLocks() const Q_DECL_OVERRIDE;
-    QCamera::LockStatus lockStatus(QCamera::LockType lock) const Q_DECL_OVERRIDE;
-    void searchAndLock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
-    void unlock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
+    QCamera::LockTypes supportedLocks() const override;
+    QCamera::LockStatus lockStatus(QCamera::LockType lock) const override;
+    void searchAndLock(QCamera::LockTypes locks) override;
+    void unlock(QCamera::LockTypes locks) override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp
index 64b9e7e32..1f33b1e55 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp
@@ -56,13 +56,13 @@ class QAndroidCameraDataVideoOutput : public QAndroidVideoOutput
     Q_OBJECT
 public:
     explicit QAndroidCameraDataVideoOutput(QAndroidCameraVideoRendererControl *control);
-    ~QAndroidCameraDataVideoOutput() Q_DECL_OVERRIDE;
+    ~QAndroidCameraDataVideoOutput() override;
 
-    AndroidSurfaceHolder *surfaceHolder() Q_DECL_OVERRIDE;
+    AndroidSurfaceHolder *surfaceHolder() override;
 
-    bool isReady() Q_DECL_OVERRIDE;
+    bool isReady() override;
 
-    void stop() Q_DECL_OVERRIDE;
+    void stop() override;
 
 private Q_SLOTS:
     void onSurfaceCreated();
diff --git a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.h b/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.h
index a5c3c0d34..538226239 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.h
@@ -53,10 +53,10 @@ class QAndroidCameraVideoRendererControl : public QVideoRendererControl
     Q_OBJECT
 public:
     QAndroidCameraVideoRendererControl(QAndroidCameraSession *session, QObject *parent = 0);
-    ~QAndroidCameraVideoRendererControl() Q_DECL_OVERRIDE;
+    ~QAndroidCameraVideoRendererControl() override;
 
-    QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
-    void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
     QAndroidCameraSession *cameraSession() const { return m_cameraSession; }
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.h b/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.h
index 770ad659a..96fc4f77b 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.h
@@ -53,13 +53,13 @@ class QAndroidCameraZoomControl : public QCameraZoomControl
 public:
     explicit QAndroidCameraZoomControl(QAndroidCameraSession *session);
 
-    qreal maximumOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal maximumDigitalZoom() const Q_DECL_OVERRIDE;
-    qreal requestedOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal requestedDigitalZoom() const Q_DECL_OVERRIDE;
-    qreal currentOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal currentDigitalZoom() const Q_DECL_OVERRIDE;
-    void zoomTo(qreal optical, qreal digital) Q_DECL_OVERRIDE;
+    qreal maximumOpticalZoom() const override;
+    qreal maximumDigitalZoom() const override;
+    qreal requestedOpticalZoom() const override;
+    qreal requestedDigitalZoom() const override;
+    qreal currentOpticalZoom() const override;
+    qreal currentDigitalZoom() const override;
+    void zoomTo(qreal optical, qreal digital) override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h b/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
index 36e10024e..52f602e78 100644
--- a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
@@ -52,11 +52,11 @@ class QAndroidImageEncoderControl : public QImageEncoderControl
 public:
     explicit QAndroidImageEncoderControl(QAndroidCameraSession *session);
 
-    QStringList supportedImageCodecs() const Q_DECL_OVERRIDE;
-    QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
-    void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedImageCodecs() const override;
+    QString imageCodecDescription(const QString &codecName) const override;
+    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const override;
+    QImageEncoderSettings imageSettings() const override;
+    void setImageSettings(const QImageEncoderSettings &settings) override;
 
 private Q_SLOTS:
     void onCameraOpened();
diff --git a/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h b/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h
index 35c715072..1d90fb6cd 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h
@@ -52,10 +52,10 @@ class QAndroidMediaContainerControl : public QMediaContainerControl
 public:
     QAndroidMediaContainerControl(QAndroidCaptureSession *session);
 
-    QStringList supportedContainers() const Q_DECL_OVERRIDE;
-    QString containerFormat() const Q_DECL_OVERRIDE;
-    void setContainerFormat(const QString &format) Q_DECL_OVERRIDE;
-    QString containerDescription(const QString &formatMimeType) const Q_DECL_OVERRIDE;
+    QStringList supportedContainers() const override;
+    QString containerFormat() const override;
+    void setContainerFormat(const QString &format) override;
+    QString containerDescription(const QString &formatMimeType) const override;
 
 private:
     QAndroidCaptureSession *m_session;
diff --git a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h b/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h
index 187a0f944..6da59a50d 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h
@@ -52,19 +52,19 @@ class QAndroidMediaRecorderControl : public QMediaRecorderControl
 public:
     explicit QAndroidMediaRecorderControl(QAndroidCaptureSession *session);
 
-    QUrl outputLocation() const Q_DECL_OVERRIDE;
-    bool setOutputLocation(const QUrl &location) Q_DECL_OVERRIDE;
-    QMediaRecorder::State state() const Q_DECL_OVERRIDE;
-    QMediaRecorder::Status status() const Q_DECL_OVERRIDE;
-    qint64 duration() const Q_DECL_OVERRIDE;
-    bool isMuted() const Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
-    void applySettings() Q_DECL_OVERRIDE;
+    QUrl outputLocation() const override;
+    bool setOutputLocation(const QUrl &location) override;
+    QMediaRecorder::State state() const override;
+    QMediaRecorder::Status status() const override;
+    qint64 duration() const override;
+    bool isMuted() const override;
+    qreal volume() const override;
+    void applySettings() override;
 
 public Q_SLOTS:
-    void setState(QMediaRecorder::State state) Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
+    void setState(QMediaRecorder::State state) override;
+    void setMuted(bool muted) override;
+    void setVolume(qreal volume) override;
 
 private:
     QAndroidCaptureSession *m_session;
diff --git a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h b/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h
index 91f84500e..146b44ac4 100644
--- a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h
@@ -52,12 +52,12 @@ class QAndroidVideoEncoderSettingsControl : public QVideoEncoderSettingsControl
 public:
     explicit QAndroidVideoEncoderSettingsControl(QAndroidCaptureSession *session);
 
-    QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QStringList supportedVideoCodecs() const Q_DECL_OVERRIDE;
-    QString videoCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QVideoEncoderSettings videoSettings() const Q_DECL_OVERRIDE;
-    void setVideoSettings(const QVideoEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const override;
+    QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings, bool *continuous = 0) const override;
+    QStringList supportedVideoCodecs() const override;
+    QString videoCodecDescription(const QString &codecName) const override;
+    QVideoEncoderSettings videoSettings() const override;
+    void setVideoSettings(const QVideoEncoderSettings &settings) override;
 
 private:
     QAndroidCaptureSession *m_session;
diff --git a/src/plugins/android/src/mediacapture/qandroidviewfindersettingscontrol.h b/src/plugins/android/src/mediacapture/qandroidviewfindersettingscontrol.h
index 79ebf3fc2..c7863a144 100644
--- a/src/plugins/android/src/mediacapture/qandroidviewfindersettingscontrol.h
+++ b/src/plugins/android/src/mediacapture/qandroidviewfindersettingscontrol.h
@@ -58,9 +58,9 @@ class QAndroidViewfinderSettingsControl2 : public QCameraViewfinderSettingsContr
 public:
     explicit QAndroidViewfinderSettingsControl2(QAndroidCameraSession *session);
 
-    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const Q_DECL_OVERRIDE;
-    QCameraViewfinderSettings viewfinderSettings() const Q_DECL_OVERRIDE;
-    void setViewfinderSettings(const QCameraViewfinderSettings &settings) Q_DECL_OVERRIDE;
+    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const override;
+    QCameraViewfinderSettings viewfinderSettings() const override;
+    void setViewfinderSettings(const QCameraViewfinderSettings &settings) override;
 
 private:
     QAndroidCameraSession *m_cameraSession;
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
index d6ec63af8..04f728a59 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
@@ -54,24 +54,24 @@ class QAndroidMediaPlayerControl : public QMediaPlayerControl
     Q_OBJECT
 public:
     explicit QAndroidMediaPlayerControl(QObject *parent = 0);
-    ~QAndroidMediaPlayerControl() Q_DECL_OVERRIDE;
+    ~QAndroidMediaPlayerControl() override;
 
-    QMediaPlayer::State state() const Q_DECL_OVERRIDE;
-    QMediaPlayer::MediaStatus mediaStatus() const Q_DECL_OVERRIDE;
-    qint64 duration() const Q_DECL_OVERRIDE;
-    qint64 position() const Q_DECL_OVERRIDE;
-    int volume() const Q_DECL_OVERRIDE;
-    bool isMuted() const Q_DECL_OVERRIDE;
-    int bufferStatus() const Q_DECL_OVERRIDE;
-    bool isAudioAvailable() const Q_DECL_OVERRIDE;
-    bool isVideoAvailable() const Q_DECL_OVERRIDE;
-    bool isSeekable() const Q_DECL_OVERRIDE;
-    QMediaTimeRange availablePlaybackRanges() const Q_DECL_OVERRIDE;
-    qreal playbackRate() const Q_DECL_OVERRIDE;
-    void setPlaybackRate(qreal rate) Q_DECL_OVERRIDE;
-    QMediaContent media() const Q_DECL_OVERRIDE;
-    const QIODevice *mediaStream() const Q_DECL_OVERRIDE;
-    void setMedia(const QMediaContent &mediaContent, QIODevice *stream) Q_DECL_OVERRIDE;
+    QMediaPlayer::State state() const override;
+    QMediaPlayer::MediaStatus mediaStatus() const override;
+    qint64 duration() const override;
+    qint64 position() const override;
+    int volume() const override;
+    bool isMuted() const override;
+    int bufferStatus() const override;
+    bool isAudioAvailable() const override;
+    bool isVideoAvailable() const override;
+    bool isSeekable() const override;
+    QMediaTimeRange availablePlaybackRanges() const override;
+    qreal playbackRate() const override;
+    void setPlaybackRate(qreal rate) override;
+    QMediaContent media() const override;
+    const QIODevice *mediaStream() const override;
+    void setMedia(const QMediaContent &mediaContent, QIODevice *stream) override;
 
     void setVideoOutput(QAndroidVideoOutput *videoOutput);
 
@@ -79,12 +79,12 @@ Q_SIGNALS:
     void metaDataUpdated();
 
 public Q_SLOTS:
-    void setPosition(qint64 position) Q_DECL_OVERRIDE;
-    void play() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void setVolume(int volume) Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
+    void setPosition(qint64 position) override;
+    void play() override;
+    void pause() override;
+    void stop() override;
+    void setVolume(int volume) override;
+    void setMuted(bool muted) override;
 
 private Q_SLOTS:
     void onVideoOutputReady(bool ready);
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
index 2f01d986f..ef213cc57 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
@@ -52,10 +52,10 @@ class QAndroidMediaPlayerVideoRendererControl : public QVideoRendererControl
     Q_OBJECT
 public:
     QAndroidMediaPlayerVideoRendererControl(QAndroidMediaPlayerControl *mediaPlayer, QObject *parent = 0);
-    ~QAndroidMediaPlayerVideoRendererControl() Q_DECL_OVERRIDE;
+    ~QAndroidMediaPlayerVideoRendererControl() override;
 
-    QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
-    void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
 private:
     QAndroidMediaPlayerControl *m_mediaPlayerControl;
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaservice.h b/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
index f81078d0f..f78d05ddd 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
@@ -53,10 +53,10 @@ class QAndroidMediaService : public QMediaService
     Q_OBJECT
 public:
     explicit QAndroidMediaService(QObject *parent = 0);
-    ~QAndroidMediaService() Q_DECL_OVERRIDE;
+    ~QAndroidMediaService() override;
 
-    QMediaControl* requestControl(const char *name) Q_DECL_OVERRIDE;
-    void releaseControl(QMediaControl *control) Q_DECL_OVERRIDE;
+    QMediaControl* requestControl(const char *name) override;
+    void releaseControl(QMediaControl *control) override;
 
 private:
     QAndroidMediaPlayerControl *mMediaControl;
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
index 4354eb54e..f2b1b47f1 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
+++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
@@ -53,12 +53,12 @@ class QAndroidMetaDataReaderControl : public QMetaDataReaderControl
     Q_OBJECT
 public:
     explicit QAndroidMetaDataReaderControl(QObject *parent = 0);
-    ~QAndroidMetaDataReaderControl() Q_DECL_OVERRIDE;
+    ~QAndroidMetaDataReaderControl() override;
 
-    bool isMetaDataAvailable() const Q_DECL_OVERRIDE;
+    bool isMetaDataAvailable() const override;
 
-    QVariant metaData(const QString &key) const Q_DECL_OVERRIDE;
-    QStringList availableMetaData() const Q_DECL_OVERRIDE;
+    QVariant metaData(const QString &key) const override;
+    QStringList availableMetaData() const override;
 
 public Q_SLOTS:
     void onMediaChanged(const QMediaContent &media);
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.h b/src/plugins/android/src/qandroidmediaserviceplugin.h
index 2ac6f2f14..3ae1a36b6 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.h
+++ b/src/plugins/android/src/qandroidmediaserviceplugin.h
@@ -63,17 +63,17 @@ public:
     QAndroidMediaServicePlugin();
     ~QAndroidMediaServicePlugin();
 
-    QMediaService* create(QString const& key) Q_DECL_OVERRIDE;
-    void release(QMediaService *service) Q_DECL_OVERRIDE;
+    QMediaService* create(QString const& key) override;
+    void release(QMediaService *service) override;
 
-    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const Q_DECL_OVERRIDE;
+    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override;
 
-    QByteArray defaultDevice(const QByteArray &service) const Q_DECL_OVERRIDE;
-    QList<QByteArray> devices(const QByteArray &service) const Q_DECL_OVERRIDE;
-    QString deviceDescription(const QByteArray &service, const QByteArray &device) Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(const QByteArray &service) const override;
+    QList<QByteArray> devices(const QByteArray &service) const override;
+    QString deviceDescription(const QByteArray &service, const QByteArray &device) override;
 
-    QCamera::Position cameraPosition(const QByteArray &device) const Q_DECL_OVERRIDE;
-    int cameraOrientation(const QByteArray &device) const Q_DECL_OVERRIDE;
+    QCamera::Position cameraPosition(const QByteArray &device) const override;
+    int cameraOrientation(const QByteArray &device) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h b/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
index 3d81d6294..4ba987e53 100644
--- a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
@@ -54,11 +54,11 @@ class AVFAudioEncoderSettingsControl : public QAudioEncoderSettingsControl
 public:
     explicit AVFAudioEncoderSettingsControl(AVFCameraService *service);
 
-    QStringList supportedAudioCodecs() const Q_DECL_OVERRIDE;
-    QString codecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QAudioEncoderSettings audioSettings() const Q_DECL_OVERRIDE;
-    void setAudioSettings(const QAudioEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedAudioCodecs() const override;
+    QString codecDescription(const QString &codecName) const override;
+    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const override;
+    QAudioEncoderSettings audioSettings() const override;
+    void setAudioSettings(const QAudioEncoderSettings &settings) override;
 
     NSDictionary *applySettings();
     void unapplySettings();
diff --git a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h b/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
index 30f90208c..0e2846889 100644
--- a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
@@ -57,13 +57,13 @@ class AVFCameraExposureControl : public QCameraExposureControl
 public:
     AVFCameraExposureControl(AVFCameraService *service);
 
-    bool isParameterSupported(ExposureParameter parameter) const Q_DECL_OVERRIDE;
+    bool isParameterSupported(ExposureParameter parameter) const override;
     QVariantList supportedParameterRange(ExposureParameter parameter,
-                                         bool *continuous) const Q_DECL_OVERRIDE;
+                                         bool *continuous) const override;
 
-    QVariant requestedValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    QVariant actualValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    bool setValue(ExposureParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant requestedValue(ExposureParameter parameter) const override;
+    QVariant actualValue(ExposureParameter parameter) const override;
+    bool setValue(ExposureParameter parameter, const QVariant &value) override;
 
 private Q_SLOTS:
     void cameraStateChanged();
diff --git a/src/plugins/avfoundation/camera/avfcameraflashcontrol.h b/src/plugins/avfoundation/camera/avfcameraflashcontrol.h
index f8a11a821..58403e829 100644
--- a/src/plugins/avfoundation/camera/avfcameraflashcontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraflashcontrol.h
@@ -56,10 +56,10 @@ class AVFCameraFlashControl : public QCameraFlashControl
 public:
     AVFCameraFlashControl(AVFCameraService *service);
 
-    QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE;
-    void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE;
-    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE;
-    bool isFlashReady() const Q_DECL_OVERRIDE;
+    QCameraExposure::FlashModes flashMode() const override;
+    void setFlashMode(QCameraExposure::FlashModes mode) override;
+    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override;
+    bool isFlashReady() const override;
 
 private Q_SLOTS:
     void cameraStateChanged(QCamera::State newState);
diff --git a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h b/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
index 9d8b7a5ab..26135e534 100644
--- a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
+++ b/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
@@ -58,17 +58,17 @@ class AVFCameraFocusControl : public QCameraFocusControl
 public:
     explicit AVFCameraFocusControl(AVFCameraService *service);
 
-    QCameraFocus::FocusModes focusMode() const Q_DECL_OVERRIDE;
-    void setFocusMode(QCameraFocus::FocusModes mode) Q_DECL_OVERRIDE;
-    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const Q_DECL_OVERRIDE;
+    QCameraFocus::FocusModes focusMode() const override;
+    void setFocusMode(QCameraFocus::FocusModes mode) override;
+    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override;
 
-    QCameraFocus::FocusPointMode focusPointMode() const Q_DECL_OVERRIDE;
-    void setFocusPointMode(QCameraFocus::FocusPointMode mode) Q_DECL_OVERRIDE;
-    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Q_DECL_OVERRIDE;
-    QPointF customFocusPoint() const Q_DECL_OVERRIDE;
-    void setCustomFocusPoint(const QPointF &point) Q_DECL_OVERRIDE;
+    QCameraFocus::FocusPointMode focusPointMode() const override;
+    void setFocusPointMode(QCameraFocus::FocusPointMode mode) override;
+    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const override;
+    QPointF customFocusPoint() const override;
+    void setCustomFocusPoint(const QPointF &point) override;
 
-    QCameraFocusZoneList focusZones() const Q_DECL_OVERRIDE;
+    QCameraFocusZoneList focusZones() const override;
 
 private Q_SLOTS:
     void cameraStateChanged();
diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
index bed755339..588aa7b74 100644
--- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
@@ -67,9 +67,9 @@ class AVFCameraViewfinderSettingsControl2 : public QCameraViewfinderSettingsCont
 public:
     AVFCameraViewfinderSettingsControl2(AVFCameraService *service);
 
-    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const Q_DECL_OVERRIDE;
-    QCameraViewfinderSettings viewfinderSettings() const Q_DECL_OVERRIDE;
-    void setViewfinderSettings(const QCameraViewfinderSettings &settings) Q_DECL_OVERRIDE;
+    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const override;
+    QCameraViewfinderSettings viewfinderSettings() const override;
+    void setViewfinderSettings(const QCameraViewfinderSettings &settings) override;
 
     // "Converters":
     static QVideoFrame::PixelFormat QtPixelFormatFromCVFormat(unsigned avPixelFormat);
@@ -97,9 +97,9 @@ class AVFCameraViewfinderSettingsControl : public QCameraViewfinderSettingsContr
 public:
     AVFCameraViewfinderSettingsControl(AVFCameraService *service);
 
-    bool isViewfinderParameterSupported(ViewfinderParameter parameter) const Q_DECL_OVERRIDE;
-    QVariant viewfinderParameter(ViewfinderParameter parameter) const Q_DECL_OVERRIDE;
-    void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isViewfinderParameterSupported(ViewfinderParameter parameter) const override;
+    QVariant viewfinderParameter(ViewfinderParameter parameter) const override;
+    void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) override;
 
 private:
     void setResolution(const QVariant &resolution);
diff --git a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h
index 6a460ad59..2307dfc28 100644
--- a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h
+++ b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h
@@ -57,15 +57,15 @@ class AVFCameraZoomControl : public QCameraZoomControl
 public:
     AVFCameraZoomControl(AVFCameraService *service);
 
-    qreal maximumOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal maximumDigitalZoom() const Q_DECL_OVERRIDE;
+    qreal maximumOpticalZoom() const override;
+    qreal maximumDigitalZoom() const override;
 
-    qreal requestedOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal requestedDigitalZoom() const Q_DECL_OVERRIDE;
-    qreal currentOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal currentDigitalZoom() const Q_DECL_OVERRIDE;
+    qreal requestedOpticalZoom() const override;
+    qreal requestedDigitalZoom() const override;
+    qreal currentOpticalZoom() const override;
+    qreal currentDigitalZoom() const override;
 
-    void zoomTo(qreal optical, qreal digital) Q_DECL_OVERRIDE;
+    void zoomTo(qreal optical, qreal digital) override;
 
 private Q_SLOTS:
     void cameraStateChanged();
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.h b/src/plugins/avfoundation/camera/avfimageencodercontrol.h
index 22a6b2722..7e2e34294 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.h
+++ b/src/plugins/avfoundation/camera/avfimageencodercontrol.h
@@ -61,12 +61,12 @@ class AVFImageEncoderControl : public QImageEncoderControl
 public:
     AVFImageEncoderControl(AVFCameraService *service);
 
-    QStringList supportedImageCodecs() const Q_DECL_OVERRIDE;
-    QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
+    QStringList supportedImageCodecs() const override;
+    QString imageCodecDescription(const QString &codecName) const override;
     QList<QSize> supportedResolutions(const QImageEncoderSettings &settings,
-                                      bool *continuous) const Q_DECL_OVERRIDE;
-    QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
-    void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
+                                      bool *continuous) const override;
+    QImageEncoderSettings imageSettings() const override;
+    void setImageSettings(const QImageEncoderSettings &settings) override;
 
     QImageEncoderSettings requestedSettings() const;
 
diff --git a/src/plugins/avfoundation/camera/avfmediacontainercontrol.h b/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
index 45d69f18b..e43e70baf 100644
--- a/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
+++ b/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
@@ -53,10 +53,10 @@ class AVFMediaContainerControl : public QMediaContainerControl
 public:
     explicit AVFMediaContainerControl(AVFCameraService *service);
 
-    QStringList supportedContainers() const Q_DECL_OVERRIDE;
-    QString containerFormat() const Q_DECL_OVERRIDE;
-    void setContainerFormat(const QString &format) Q_DECL_OVERRIDE;
-    QString containerDescription(const QString &formatMimeType) const Q_DECL_OVERRIDE;
+    QStringList supportedContainers() const override;
+    QString containerFormat() const override;
+    void setContainerFormat(const QString &format) override;
+    QString containerDescription(const QString &formatMimeType) const override;
 
     NSString *fileType() const;
 
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
index a0967efa3..8e049a595 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
@@ -65,24 +65,24 @@ public:
     AVFMediaRecorderControlIOS(AVFCameraService *service, QObject *parent = 0);
     ~AVFMediaRecorderControlIOS();
 
-    QUrl outputLocation() const Q_DECL_OVERRIDE;
-    bool setOutputLocation(const QUrl &location) Q_DECL_OVERRIDE;
+    QUrl outputLocation() const override;
+    bool setOutputLocation(const QUrl &location) override;
 
-    QMediaRecorder::State state() const Q_DECL_OVERRIDE;
-    QMediaRecorder::Status status() const Q_DECL_OVERRIDE;
+    QMediaRecorder::State state() const override;
+    QMediaRecorder::Status status() const override;
 
-    qint64 duration() const Q_DECL_OVERRIDE;
+    qint64 duration() const override;
 
-    bool isMuted() const Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
+    bool isMuted() const override;
+    qreal volume() const override;
 
-    void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
     void unapplySettings();
 
 public Q_SLOTS:
-    void setState(QMediaRecorder::State state) Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
+    void setState(QMediaRecorder::State state) override;
+    void setMuted(bool muted) override;
+    void setVolume(qreal volume) override;
 
 private:
 
diff --git a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
index 4d90377d5..9bdf5a788 100644
--- a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
@@ -59,16 +59,16 @@ public:
     explicit AVFVideoEncoderSettingsControl(AVFCameraService *service);
 
     QList<QSize> supportedResolutions(const QVideoEncoderSettings &requestedVideoSettings,
-                                      bool *continuous = 0) const Q_DECL_OVERRIDE;
+                                      bool *continuous = 0) const override;
 
     QList<qreal> supportedFrameRates(const QVideoEncoderSettings &requestedVideoSettings,
-                                     bool *continuous = 0) const Q_DECL_OVERRIDE;
+                                     bool *continuous = 0) const override;
 
-    QStringList supportedVideoCodecs() const Q_DECL_OVERRIDE;
-    QString videoCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
+    QStringList supportedVideoCodecs() const override;
+    QString videoCodecDescription(const QString &codecName) const override;
 
-    QVideoEncoderSettings videoSettings() const Q_DECL_OVERRIDE;
-    void setVideoSettings(const QVideoEncoderSettings &requestedVideoSettings) Q_DECL_OVERRIDE;
+    QVideoEncoderSettings videoSettings() const override;
+    void setVideoSettings(const QVideoEncoderSettings &requestedVideoSettings) override;
 
     NSDictionary *applySettings(AVCaptureConnection *connection);
     void unapplySettings(AVCaptureConnection *connection);
diff --git a/src/plugins/coreaudio/coreaudioplugin.h b/src/plugins/coreaudio/coreaudioplugin.h
index da18d8cfe..5407bdeb9 100644
--- a/src/plugins/coreaudio/coreaudioplugin.h
+++ b/src/plugins/coreaudio/coreaudioplugin.h
@@ -54,11 +54,11 @@ public:
     explicit CoreAudioPlugin(QObject *parent = 0);
     ~CoreAudioPlugin() {}
 
-    QByteArray defaultDevice(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QList<QByteArray> availableDevices(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QAbstractAudioInput *createInput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioOutput *createOutput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(QAudio::Mode mode) const override;
+    QList<QByteArray> availableDevices(QAudio::Mode mode) const override;
+    QAbstractAudioInput *createInput(const QByteArray &device) override;
+    QAbstractAudioOutput *createOutput(const QByteArray &device) override;
+    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/opensles/qopenslesaudiooutput.h b/src/plugins/opensles/qopenslesaudiooutput.h
index 4c724dca6..b480f00e6 100644
--- a/src/plugins/opensles/qopenslesaudiooutput.h
+++ b/src/plugins/opensles/qopenslesaudiooutput.h
@@ -57,30 +57,30 @@ public:
     QOpenSLESAudioOutput(const QByteArray &device);
     ~QOpenSLESAudioOutput();
 
-    void start(QIODevice *device) Q_DECL_OVERRIDE;
-    QIODevice *start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void suspend() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    int bytesFree() const Q_DECL_OVERRIDE;
-    int periodSize() const Q_DECL_OVERRIDE;
-    void setBufferSize(int value) Q_DECL_OVERRIDE;
-    int bufferSize() const Q_DECL_OVERRIDE;
-    void setNotifyInterval(int milliSeconds) Q_DECL_OVERRIDE;
-    int notifyInterval() const Q_DECL_OVERRIDE;
-    qint64 processedUSecs() const Q_DECL_OVERRIDE;
-    qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
-    QAudio::Error error() const Q_DECL_OVERRIDE;
-    QAudio::State state() const Q_DECL_OVERRIDE;
-    void setFormat(const QAudioFormat &format) Q_DECL_OVERRIDE;
-    QAudioFormat format() const Q_DECL_OVERRIDE;
-
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
-
-    void setCategory(const QString &category) Q_DECL_OVERRIDE;
-    QString category() const Q_DECL_OVERRIDE;
+    void start(QIODevice *device) override;
+    QIODevice *start() override;
+    void stop() override;
+    void reset() override;
+    void suspend() override;
+    void resume() override;
+    int bytesFree() const override;
+    int periodSize() const override;
+    void setBufferSize(int value) override;
+    int bufferSize() const override;
+    void setNotifyInterval(int milliSeconds) override;
+    int notifyInterval() const override;
+    qint64 processedUSecs() const override;
+    qint64 elapsedUSecs() const override;
+    QAudio::Error error() const override;
+    QAudio::State state() const override;
+    void setFormat(const QAudioFormat &format) override;
+    QAudioFormat format() const override;
+
+    void setVolume(qreal volume) override;
+    qreal volume() const override;
+
+    void setCategory(const QString &category) override;
+    QString category() const override;
 
 private:
     friend class SLIODevicePrivate;
@@ -138,11 +138,11 @@ class SLIODevicePrivate : public QIODevice
 
 public:
     inline SLIODevicePrivate(QOpenSLESAudioOutput *audio) : m_audioDevice(audio) {}
-    inline ~SLIODevicePrivate() Q_DECL_OVERRIDE {}
+    inline ~SLIODevicePrivate() override {}
 
 protected:
-    inline qint64 readData(char *, qint64) Q_DECL_OVERRIDE { return 0; }
-    inline qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    inline qint64 readData(char *, qint64) override { return 0; }
+    inline qint64 writeData(const char *data, qint64 len) override;
 
 private:
     QOpenSLESAudioOutput *m_audioDevice;
diff --git a/src/plugins/qnx-audio/audio/qnxaudiodeviceinfo.h b/src/plugins/qnx-audio/audio/qnxaudiodeviceinfo.h
index 432c22163..cb620be3b 100644
--- a/src/plugins/qnx-audio/audio/qnxaudiodeviceinfo.h
+++ b/src/plugins/qnx-audio/audio/qnxaudiodeviceinfo.h
@@ -52,15 +52,15 @@ public:
     QnxAudioDeviceInfo(const QString &deviceName, QAudio::Mode mode);
     ~QnxAudioDeviceInfo();
 
-    QAudioFormat preferredFormat() const Q_DECL_OVERRIDE;
-    bool isFormatSupported(const QAudioFormat &format) const Q_DECL_OVERRIDE;
-    QString deviceName() const Q_DECL_OVERRIDE;
-    QStringList supportedCodecs() Q_DECL_OVERRIDE;
-    QList<int> supportedSampleRates() Q_DECL_OVERRIDE;
-    QList<int> supportedChannelCounts() Q_DECL_OVERRIDE;
-    QList<int> supportedSampleSizes() Q_DECL_OVERRIDE;
-    QList<QAudioFormat::Endian> supportedByteOrders() Q_DECL_OVERRIDE;
-    QList<QAudioFormat::SampleType> supportedSampleTypes() Q_DECL_OVERRIDE;
+    QAudioFormat preferredFormat() const override;
+    bool isFormatSupported(const QAudioFormat &format) const override;
+    QString deviceName() const override;
+    QStringList supportedCodecs() override;
+    QList<int> supportedSampleRates() override;
+    QList<int> supportedChannelCounts() override;
+    QList<int> supportedSampleSizes() override;
+    QList<QAudioFormat::Endian> supportedByteOrders() override;
+    QList<QAudioFormat::SampleType> supportedSampleTypes() override;
 
 private:
     const QString m_name;
diff --git a/src/plugins/qnx-audio/audio/qnxaudioinput.h b/src/plugins/qnx-audio/audio/qnxaudioinput.h
index 4c6bb2676..c677b6c96 100644
--- a/src/plugins/qnx-audio/audio/qnxaudioinput.h
+++ b/src/plugins/qnx-audio/audio/qnxaudioinput.h
@@ -59,26 +59,26 @@ public:
     QnxAudioInput();
     ~QnxAudioInput();
 
-    void start(QIODevice*) Q_DECL_OVERRIDE;
-    QIODevice* start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void suspend() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    int bytesReady() const Q_DECL_OVERRIDE;
-    int periodSize() const Q_DECL_OVERRIDE;
-    void setBufferSize(int ) Q_DECL_OVERRIDE;
-    int bufferSize() const  Q_DECL_OVERRIDE;
-    void setNotifyInterval(int ) Q_DECL_OVERRIDE;
-    int notifyInterval() const Q_DECL_OVERRIDE;
-    qint64 processedUSecs() const Q_DECL_OVERRIDE;
-    qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
-    QAudio::Error error() const Q_DECL_OVERRIDE;
-    QAudio::State state() const Q_DECL_OVERRIDE;
-    void setFormat(const QAudioFormat&) Q_DECL_OVERRIDE;
-    QAudioFormat format() const Q_DECL_OVERRIDE;
-    void setVolume(qreal) Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
+    void start(QIODevice*) override;
+    QIODevice* start() override;
+    void stop() override;
+    void reset() override;
+    void suspend() override;
+    void resume() override;
+    int bytesReady() const override;
+    int periodSize() const override;
+    void setBufferSize(int ) override;
+    int bufferSize() const  override;
+    void setNotifyInterval(int ) override;
+    int notifyInterval() const override;
+    qint64 processedUSecs() const override;
+    qint64 elapsedUSecs() const override;
+    QAudio::Error error() const override;
+    QAudio::State state() const override;
+    void setFormat(const QAudioFormat&) override;
+    QAudioFormat format() const override;
+    void setVolume(qreal) override;
+    qreal volume() const override;
 
 private slots:
     void userFeed();
@@ -124,8 +124,8 @@ class InputPrivate : public QIODevice
 public:
     InputPrivate(QnxAudioInput *audio);
 
-    qint64 readData(char *data, qint64 len) Q_DECL_OVERRIDE;
-    qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    qint64 readData(char *data, qint64 len) override;
+    qint64 writeData(const char *data, qint64 len) override;
 
     void trigger();
 
diff --git a/src/plugins/qnx-audio/audio/qnxaudiooutput.h b/src/plugins/qnx-audio/audio/qnxaudiooutput.h
index 85aadf4b9..7a0979f77 100644
--- a/src/plugins/qnx-audio/audio/qnxaudiooutput.h
+++ b/src/plugins/qnx-audio/audio/qnxaudiooutput.h
@@ -62,28 +62,28 @@ public:
     QnxAudioOutput();
     ~QnxAudioOutput();
 
-    void start(QIODevice *source) Q_DECL_OVERRIDE;
-    QIODevice *start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void suspend() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    int bytesFree() const Q_DECL_OVERRIDE;
-    int periodSize() const Q_DECL_OVERRIDE;
-    void setBufferSize(int) Q_DECL_OVERRIDE {}
-    int bufferSize() const Q_DECL_OVERRIDE { return 0; }
-    void setNotifyInterval(int ms) Q_DECL_OVERRIDE;
-    int notifyInterval() const Q_DECL_OVERRIDE;
-    qint64 processedUSecs() const Q_DECL_OVERRIDE;
-    qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
-    QAudio::Error error() const Q_DECL_OVERRIDE;
-    QAudio::State state() const Q_DECL_OVERRIDE;
-    void setFormat(const QAudioFormat &format) Q_DECL_OVERRIDE;
-    QAudioFormat format() const Q_DECL_OVERRIDE;
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
-    void setCategory(const QString &category) Q_DECL_OVERRIDE;
-    QString category() const Q_DECL_OVERRIDE;
+    void start(QIODevice *source) override;
+    QIODevice *start() override;
+    void stop() override;
+    void reset() override;
+    void suspend() override;
+    void resume() override;
+    int bytesFree() const override;
+    int periodSize() const override;
+    void setBufferSize(int) override {}
+    int bufferSize() const override { return 0; }
+    void setNotifyInterval(int ms) override;
+    int notifyInterval() const override;
+    qint64 processedUSecs() const override;
+    qint64 elapsedUSecs() const override;
+    QAudio::Error error() const override;
+    QAudio::State state() const override;
+    void setFormat(const QAudioFormat &format) override;
+    QAudioFormat format() const override;
+    void setVolume(qreal volume) override;
+    qreal volume() const override;
+    void setCategory(const QString &category) override;
+    QString category() const override;
 
 private slots:
     void pullData();
diff --git a/src/plugins/qnx-audio/audio/qnxaudioplugin.h b/src/plugins/qnx-audio/audio/qnxaudioplugin.h
index 1d8b8a74b..d41f4020a 100644
--- a/src/plugins/qnx-audio/audio/qnxaudioplugin.h
+++ b/src/plugins/qnx-audio/audio/qnxaudioplugin.h
@@ -55,11 +55,11 @@ public:
     explicit QnxAudioPlugin(QObject *parent = 0);
     ~QnxAudioPlugin() {}
 
-    QByteArray defaultDevice(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QList<QByteArray> availableDevices(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QAbstractAudioInput *createInput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioOutput *createOutput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(QAudio::Mode mode) const override;
+    QList<QByteArray> availableDevices(QAudio::Mode mode) const override;
+    QAbstractAudioInput *createInput(const QByteArray &device) override;
+    QAbstractAudioOutput *createOutput(const QByteArray &device) override;
+    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h b/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
index 44ee80026..38c01f86c 100644
--- a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
+++ b/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
@@ -51,11 +51,11 @@ class BbCameraAudioEncoderSettingsControl : public QAudioEncoderSettingsControl
 public:
     explicit BbCameraAudioEncoderSettingsControl(BbCameraSession *session, QObject *parent = 0);
 
-    QStringList supportedAudioCodecs() const Q_DECL_OVERRIDE;
-    QString codecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QAudioEncoderSettings audioSettings() const Q_DECL_OVERRIDE;
-    void setAudioSettings(const QAudioEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedAudioCodecs() const override;
+    QString codecDescription(const QString &codecName) const override;
+    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const override;
+    QAudioEncoderSettings audioSettings() const override;
+    void setAudioSettings(const QAudioEncoderSettings &settings) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h b/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h
index 2be6f0c3b..4aac740c8 100644
--- a/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h
+++ b/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h
@@ -49,9 +49,9 @@ class BbCameraCaptureBufferFormatControl : public QCameraCaptureBufferFormatCont
 public:
     explicit BbCameraCaptureBufferFormatControl(QObject *parent = 0);
 
-    QList<QVideoFrame::PixelFormat> supportedBufferFormats() const Q_DECL_OVERRIDE;
-    QVideoFrame::PixelFormat bufferFormat() const Q_DECL_OVERRIDE;
-    void setBufferFormat(QVideoFrame::PixelFormat format) Q_DECL_OVERRIDE;
+    QList<QVideoFrame::PixelFormat> supportedBufferFormats() const override;
+    QVideoFrame::PixelFormat bufferFormat() const override;
+    void setBufferFormat(QVideoFrame::PixelFormat format) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h b/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h
index ab6f54b3d..9586ec56a 100644
--- a/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h
+++ b/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h
@@ -51,9 +51,9 @@ class BbCameraCaptureDestinationControl : public QCameraCaptureDestinationContro
 public:
     explicit BbCameraCaptureDestinationControl(BbCameraSession *session, QObject *parent = 0);
 
-    bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const Q_DECL_OVERRIDE;
-    QCameraImageCapture::CaptureDestinations captureDestination() const Q_DECL_OVERRIDE;
-    void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) Q_DECL_OVERRIDE;
+    bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const override;
+    QCameraImageCapture::CaptureDestinations captureDestination() const override;
+    void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameracontrol.h b/src/plugins/qnx/camera/bbcameracontrol.h
index a22c8d6fa..0c97bd83c 100644
--- a/src/plugins/qnx/camera/bbcameracontrol.h
+++ b/src/plugins/qnx/camera/bbcameracontrol.h
@@ -51,16 +51,16 @@ class BbCameraControl : public QCameraControl
 public:
     explicit BbCameraControl(BbCameraSession *session, QObject *parent = 0);
 
-    QCamera::State state() const Q_DECL_OVERRIDE;
-    void setState(QCamera::State state) Q_DECL_OVERRIDE;
+    QCamera::State state() const override;
+    void setState(QCamera::State state) override;
 
-    QCamera::Status status() const Q_DECL_OVERRIDE;
+    QCamera::Status status() const override;
 
-    QCamera::CaptureModes captureMode() const Q_DECL_OVERRIDE;
-    void setCaptureMode(QCamera::CaptureModes) Q_DECL_OVERRIDE;
-    bool isCaptureModeSupported(QCamera::CaptureModes mode) const Q_DECL_OVERRIDE;
+    QCamera::CaptureModes captureMode() const override;
+    void setCaptureMode(QCamera::CaptureModes) override;
+    bool isCaptureModeSupported(QCamera::CaptureModes mode) const override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const Q_DECL_OVERRIDE;
+    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraexposurecontrol.h b/src/plugins/qnx/camera/bbcameraexposurecontrol.h
index 4f5a71518..2d0da29bd 100644
--- a/src/plugins/qnx/camera/bbcameraexposurecontrol.h
+++ b/src/plugins/qnx/camera/bbcameraexposurecontrol.h
@@ -51,12 +51,12 @@ class BbCameraExposureControl : public QCameraExposureControl
 public:
     explicit BbCameraExposureControl(BbCameraSession *session, QObject *parent = 0);
 
-    virtual bool isParameterSupported(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    virtual QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const Q_DECL_OVERRIDE;
+    bool isParameterSupported(ExposureParameter parameter) const override;
+    QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const override;
 
-    virtual QVariant requestedValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    virtual QVariant actualValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    virtual bool setValue(ExposureParameter parameter, const QVariant& value) Q_DECL_OVERRIDE;
+    QVariant requestedValue(ExposureParameter parameter) const override;
+    QVariant actualValue(ExposureParameter parameter) const override;
+    bool setValue(ExposureParameter parameter, const QVariant& value) override;
 
 private Q_SLOTS:
     void statusChanged(QCamera::Status status);
diff --git a/src/plugins/qnx/camera/bbcameraflashcontrol.h b/src/plugins/qnx/camera/bbcameraflashcontrol.h
index e4b5f0a7f..8ce9c1f41 100644
--- a/src/plugins/qnx/camera/bbcameraflashcontrol.h
+++ b/src/plugins/qnx/camera/bbcameraflashcontrol.h
@@ -51,10 +51,10 @@ class BbCameraFlashControl : public QCameraFlashControl
 public:
     explicit BbCameraFlashControl(BbCameraSession *session, QObject *parent = 0);
 
-    QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE;
-    void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE;
-    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE;
-    bool isFlashReady() const Q_DECL_OVERRIDE;
+    QCameraExposure::FlashModes flashMode() const override;
+    void setFlashMode(QCameraExposure::FlashModes mode) override;
+    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override;
+    bool isFlashReady() const override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcamerafocuscontrol.h b/src/plugins/qnx/camera/bbcamerafocuscontrol.h
index 2501aafdd..bf11ea03e 100644
--- a/src/plugins/qnx/camera/bbcamerafocuscontrol.h
+++ b/src/plugins/qnx/camera/bbcamerafocuscontrol.h
@@ -51,15 +51,15 @@ class BbCameraFocusControl : public QCameraFocusControl
 public:
     explicit BbCameraFocusControl(BbCameraSession *session, QObject *parent = 0);
 
-    QCameraFocus::FocusModes focusMode() const Q_DECL_OVERRIDE;
-    void setFocusMode(QCameraFocus::FocusModes mode) Q_DECL_OVERRIDE;
-    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const Q_DECL_OVERRIDE;
-    QCameraFocus::FocusPointMode focusPointMode() const Q_DECL_OVERRIDE;
-    void setFocusPointMode(QCameraFocus::FocusPointMode mode) Q_DECL_OVERRIDE;
-    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Q_DECL_OVERRIDE;
-    QPointF customFocusPoint() const Q_DECL_OVERRIDE;
-    void setCustomFocusPoint(const QPointF &point) Q_DECL_OVERRIDE;
-    QCameraFocusZoneList focusZones() const Q_DECL_OVERRIDE;
+    QCameraFocus::FocusModes focusMode() const override;
+    void setFocusMode(QCameraFocus::FocusModes mode) override;
+    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override;
+    QCameraFocus::FocusPointMode focusPointMode() const override;
+    void setFocusPointMode(QCameraFocus::FocusPointMode mode) override;
+    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const override;
+    QPointF customFocusPoint() const override;
+    void setCustomFocusPoint(const QPointF &point) override;
+    QCameraFocusZoneList focusZones() const override;
 
 private:
     void updateCustomFocusRegion();
diff --git a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h b/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
index 4d239ef59..b8013ba1f 100644
--- a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
+++ b/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
@@ -51,13 +51,13 @@ class BbCameraImageCaptureControl : public QCameraImageCaptureControl
 public:
     explicit BbCameraImageCaptureControl(BbCameraSession *session, QObject *parent = 0);
 
-    bool isReadyForCapture() const Q_DECL_OVERRIDE;
+    bool isReadyForCapture() const override;
 
-    QCameraImageCapture::DriveMode driveMode() const Q_DECL_OVERRIDE;
-    void setDriveMode(QCameraImageCapture::DriveMode mode) Q_DECL_OVERRIDE;
+    QCameraImageCapture::DriveMode driveMode() const override;
+    void setDriveMode(QCameraImageCapture::DriveMode mode) override;
 
-    int capture(const QString &fileName) Q_DECL_OVERRIDE;
-    void cancelCapture() Q_DECL_OVERRIDE;
+    int capture(const QString &fileName) override;
+    void cancelCapture() override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h b/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
index 2060b4d99..0eefdd2a1 100644
--- a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
+++ b/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
@@ -51,10 +51,10 @@ class BbCameraImageProcessingControl : public QCameraImageProcessingControl
 public:
     explicit BbCameraImageProcessingControl(BbCameraSession *session, QObject *parent = 0);
 
-    bool isParameterSupported(ProcessingParameter) const Q_DECL_OVERRIDE;
-    bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const Q_DECL_OVERRIDE;
-    QVariant parameter(ProcessingParameter parameter) const Q_DECL_OVERRIDE;
-    void setParameter(ProcessingParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isParameterSupported(ProcessingParameter) const override;
+    bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const override;
+    QVariant parameter(ProcessingParameter parameter) const override;
+    void setParameter(ProcessingParameter parameter, const QVariant &value) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameralockscontrol.h b/src/plugins/qnx/camera/bbcameralockscontrol.h
index f6a7e1864..be3d1bd02 100644
--- a/src/plugins/qnx/camera/bbcameralockscontrol.h
+++ b/src/plugins/qnx/camera/bbcameralockscontrol.h
@@ -59,10 +59,10 @@ public:
 
     explicit BbCameraLocksControl(BbCameraSession *session, QObject *parent = 0);
 
-    QCamera::LockTypes supportedLocks() const Q_DECL_OVERRIDE;
-    QCamera::LockStatus lockStatus(QCamera::LockType lock) const Q_DECL_OVERRIDE;
-    void searchAndLock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
-    void unlock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
+    QCamera::LockTypes supportedLocks() const override;
+    QCamera::LockStatus lockStatus(QCamera::LockType lock) const override;
+    void searchAndLock(QCamera::LockTypes locks) override;
+    void unlock(QCamera::LockTypes locks) override;
 
 private Q_SLOTS:
     void cameraOpened();
diff --git a/src/plugins/qnx/camera/bbcameramediarecordercontrol.h b/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
index 0ba82969f..af46479a5 100644
--- a/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
+++ b/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
@@ -51,19 +51,19 @@ class BbCameraMediaRecorderControl : public QMediaRecorderControl
 public:
     explicit BbCameraMediaRecorderControl(BbCameraSession *session, QObject *parent = 0);
 
-    QUrl outputLocation() const Q_DECL_OVERRIDE;
-    bool setOutputLocation(const QUrl &location) Q_DECL_OVERRIDE;
-    QMediaRecorder::State state() const Q_DECL_OVERRIDE;
-    QMediaRecorder::Status status() const Q_DECL_OVERRIDE;
-    qint64 duration() const Q_DECL_OVERRIDE;
-    bool isMuted() const Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
-    void applySettings() Q_DECL_OVERRIDE;
+    QUrl outputLocation() const override;
+    bool setOutputLocation(const QUrl &location) override;
+    QMediaRecorder::State state() const override;
+    QMediaRecorder::Status status() const override;
+    qint64 duration() const override;
+    bool isMuted() const override;
+    qreal volume() const override;
+    void applySettings() override;
 
 public Q_SLOTS:
-    void setState(QMediaRecorder::State state) Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
+    void setState(QMediaRecorder::State state) override;
+    void setMuted(bool muted) override;
+    void setVolume(qreal volume) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.h b/src/plugins/qnx/camera/bbcameraorientationhandler.h
index e730acdc7..006a259cc 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.h
+++ b/src/plugins/qnx/camera/bbcameraorientationhandler.h
@@ -51,7 +51,7 @@ public:
     explicit BbCameraOrientationHandler(QObject *parent = 0);
     ~BbCameraOrientationHandler();
 
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
 
     int orientation() const;
 
diff --git a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h b/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
index 1e0ed8708..f67196be1 100644
--- a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
+++ b/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
@@ -51,12 +51,12 @@ class BbCameraVideoEncoderSettingsControl : public QVideoEncoderSettingsControl
 public:
     explicit BbCameraVideoEncoderSettingsControl(BbCameraSession *session, QObject *parent = 0);
 
-    QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QStringList supportedVideoCodecs() const Q_DECL_OVERRIDE;
-    QString videoCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QVideoEncoderSettings videoSettings() const Q_DECL_OVERRIDE;
-    void setVideoSettings(const QVideoEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const override;
+    QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings, bool *continuous = 0) const override;
+    QStringList supportedVideoCodecs() const override;
+    QString videoCodecDescription(const QString &codecName) const override;
+    QVideoEncoderSettings videoSettings() const override;
+    void setVideoSettings(const QVideoEncoderSettings &settings) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h b/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
index b9c4af8a3..7a8e57a13 100644
--- a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
+++ b/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
@@ -51,9 +51,9 @@ class BbCameraViewfinderSettingsControl : public QCameraViewfinderSettingsContro
 public:
     explicit BbCameraViewfinderSettingsControl(BbCameraSession *session, QObject *parent = 0);
 
-    bool isViewfinderParameterSupported(ViewfinderParameter parameter) const Q_DECL_OVERRIDE;
-    QVariant viewfinderParameter(ViewfinderParameter parameter) const Q_DECL_OVERRIDE;
-    void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isViewfinderParameterSupported(ViewfinderParameter parameter) const override;
+    QVariant viewfinderParameter(ViewfinderParameter parameter) const override;
+    void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcamerazoomcontrol.h b/src/plugins/qnx/camera/bbcamerazoomcontrol.h
index fc5813db4..7b5e06f8d 100644
--- a/src/plugins/qnx/camera/bbcamerazoomcontrol.h
+++ b/src/plugins/qnx/camera/bbcamerazoomcontrol.h
@@ -52,13 +52,13 @@ class BbCameraZoomControl : public QCameraZoomControl
 public:
     explicit BbCameraZoomControl(BbCameraSession *session, QObject *parent = 0);
 
-    qreal maximumOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal maximumDigitalZoom() const Q_DECL_OVERRIDE;
-    qreal requestedOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal requestedDigitalZoom() const Q_DECL_OVERRIDE;
-    qreal currentOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal currentDigitalZoom() const Q_DECL_OVERRIDE;
-    void zoomTo(qreal optical, qreal digital) Q_DECL_OVERRIDE;
+    qreal maximumOpticalZoom() const override;
+    qreal maximumDigitalZoom() const override;
+    qreal requestedOpticalZoom() const override;
+    qreal requestedDigitalZoom() const override;
+    qreal currentOpticalZoom() const override;
+    qreal currentDigitalZoom() const override;
+    void zoomTo(qreal optical, qreal digital) override;
 
 private Q_SLOTS:
     void statusChanged(QCamera::Status status);
diff --git a/src/plugins/qnx/camera/bbimageencodercontrol.h b/src/plugins/qnx/camera/bbimageencodercontrol.h
index adb506f1f..bb246def6 100644
--- a/src/plugins/qnx/camera/bbimageencodercontrol.h
+++ b/src/plugins/qnx/camera/bbimageencodercontrol.h
@@ -51,11 +51,11 @@ class BbImageEncoderControl : public QImageEncoderControl
 public:
     explicit BbImageEncoderControl(BbCameraSession *session, QObject *parent = 0);
 
-    QStringList supportedImageCodecs() const Q_DECL_OVERRIDE;
-    QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
-    void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedImageCodecs() const override;
+    QString imageCodecDescription(const QString &codecName) const override;
+    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const override;
+    QImageEncoderSettings imageSettings() const override;
+    void setImageSettings(const QImageEncoderSettings &settings) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h b/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
index 051fd713a..08d6cbb14 100644
--- a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
+++ b/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
@@ -52,16 +52,16 @@ class BbVideoDeviceSelectorControl : public QVideoDeviceSelectorControl
 public:
     explicit BbVideoDeviceSelectorControl(BbCameraSession *session, QObject *parent = 0);
 
-    int deviceCount() const Q_DECL_OVERRIDE;
-    QString deviceName(int index) const Q_DECL_OVERRIDE;
-    QString deviceDescription(int index) const Q_DECL_OVERRIDE;
-    int defaultDevice() const Q_DECL_OVERRIDE;
-    int selectedDevice() const Q_DECL_OVERRIDE;
+    int deviceCount() const override;
+    QString deviceName(int index) const override;
+    QString deviceDescription(int index) const override;
+    int defaultDevice() const override;
+    int selectedDevice() const override;
 
     static void enumerateDevices(QList<QByteArray> *devices, QStringList *descriptions);
 
 public Q_SLOTS:
-    void setSelectedDevice(int index) Q_DECL_OVERRIDE;
+    void setSelectedDevice(int index) override;
 
 private:
     BbCameraSession* m_session;
diff --git a/src/plugins/qnx/camera/bbvideorenderercontrol.h b/src/plugins/qnx/camera/bbvideorenderercontrol.h
index 44bd5ca1b..441ff369d 100644
--- a/src/plugins/qnx/camera/bbvideorenderercontrol.h
+++ b/src/plugins/qnx/camera/bbvideorenderercontrol.h
@@ -51,8 +51,8 @@ class BbVideoRendererControl : public QVideoRendererControl
 public:
     explicit BbVideoRendererControl(BbCameraSession *session, QObject *parent = 0);
 
-    QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
-    void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
 private:
     BbCameraSession *m_session;
diff --git a/src/plugins/qnx/common/windowgrabber.h b/src/plugins/qnx/common/windowgrabber.h
index 4278f2e3a..4b2217f74 100644
--- a/src/plugins/qnx/common/windowgrabber.h
+++ b/src/plugins/qnx/common/windowgrabber.h
@@ -100,7 +100,7 @@ public:
     void pause();
     void resume();
 
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
 
     bool handleScreenEvent(screen_event_t event);
 
diff --git a/src/plugins/qnx/mediaplayer/mmrendereraudiorolecontrol.h b/src/plugins/qnx/mediaplayer/mmrendereraudiorolecontrol.h
index 7458d3512..d0d2165eb 100644
--- a/src/plugins/qnx/mediaplayer/mmrendereraudiorolecontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmrendereraudiorolecontrol.h
@@ -49,10 +49,10 @@ class MmRendererAudioRoleControl : public QAudioRoleControl
 public:
     explicit MmRendererAudioRoleControl(QObject *parent = 0);
 
-    QAudio::Role audioRole() const Q_DECL_OVERRIDE;
-    void setAudioRole(QAudio::Role role) Q_DECL_OVERRIDE;
+    QAudio::Role audioRole() const override;
+    void setAudioRole(QAudio::Role role) override;
 
-    QList<QAudio::Role> supportedAudioRoles() const Q_DECL_OVERRIDE;
+    QList<QAudio::Role> supportedAudioRoles() const override;
 
 private:
     QAudio::Role m_role;
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
index 655570656..db67bfa58 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
@@ -62,40 +62,40 @@ class MmRendererMediaPlayerControl : public QMediaPlayerControl, public QAbstrac
 public:
     explicit MmRendererMediaPlayerControl(QObject *parent = 0);
 
-    QMediaPlayer::State state() const Q_DECL_OVERRIDE;
+    QMediaPlayer::State state() const override;
 
-    QMediaPlayer::MediaStatus mediaStatus() const Q_DECL_OVERRIDE;
+    QMediaPlayer::MediaStatus mediaStatus() const override;
 
-    qint64 duration() const Q_DECL_OVERRIDE;
+    qint64 duration() const override;
 
-    qint64 position() const Q_DECL_OVERRIDE;
-    void setPosition(qint64 position) Q_DECL_OVERRIDE;
+    qint64 position() const override;
+    void setPosition(qint64 position) override;
 
-    int volume() const Q_DECL_OVERRIDE;
-    void setVolume(int volume) Q_DECL_OVERRIDE;
+    int volume() const override;
+    void setVolume(int volume) override;
 
-    bool isMuted() const Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
+    bool isMuted() const override;
+    void setMuted(bool muted) override;
 
-    int bufferStatus() const Q_DECL_OVERRIDE;
+    int bufferStatus() const override;
 
-    bool isAudioAvailable() const Q_DECL_OVERRIDE;
-    bool isVideoAvailable() const Q_DECL_OVERRIDE;
+    bool isAudioAvailable() const override;
+    bool isVideoAvailable() const override;
 
-    bool isSeekable() const Q_DECL_OVERRIDE;
+    bool isSeekable() const override;
 
-    QMediaTimeRange availablePlaybackRanges() const Q_DECL_OVERRIDE;
+    QMediaTimeRange availablePlaybackRanges() const override;
 
-    qreal playbackRate() const Q_DECL_OVERRIDE;
-    void setPlaybackRate(qreal rate) Q_DECL_OVERRIDE;
+    qreal playbackRate() const override;
+    void setPlaybackRate(qreal rate) override;
 
-    QMediaContent media() const Q_DECL_OVERRIDE;
-    const QIODevice *mediaStream() const Q_DECL_OVERRIDE;
-    void setMedia(const QMediaContent &media, QIODevice *stream) Q_DECL_OVERRIDE;
+    QMediaContent media() const override;
+    const QIODevice *mediaStream() const override;
+    void setMedia(const QMediaContent &media, QIODevice *stream) override;
 
-    void play() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void play() override;
+    void pause() override;
+    void stop() override;
 
     MmRendererPlayerVideoRendererControl *videoRendererControl() const;
     void setVideoRendererControl(MmRendererPlayerVideoRendererControl *videoControl);
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.h b/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.h
index 9434b85b2..b1d26a9b9 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.h
+++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.h
@@ -57,8 +57,8 @@ public:
     explicit MmRendererMediaPlayerService(QObject *parent = 0);
     ~MmRendererMediaPlayerService();
 
-    QMediaControl *requestControl(const char *name) Q_DECL_OVERRIDE;
-    void releaseControl(QMediaControl *control) Q_DECL_OVERRIDE;
+    QMediaControl *requestControl(const char *name) override;
+    void releaseControl(QMediaControl *control) override;
 
 private:
     void updateControls();
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.h b/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.h
index 9c000224e..878420460 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.h
@@ -50,10 +50,10 @@ class MmRendererMetaDataReaderControl : public QMetaDataReaderControl
 public:
     explicit MmRendererMetaDataReaderControl(QObject *parent = 0);
 
-    bool isMetaDataAvailable() const Q_DECL_OVERRIDE;
+    bool isMetaDataAvailable() const override;
 
-    QVariant metaData(const QString &key) const Q_DECL_OVERRIDE;
-    QStringList availableMetaData() const Q_DECL_OVERRIDE;
+    QVariant metaData(const QString &key) const override;
+    QStringList availableMetaData() const override;
 
     void setMetaData(const MmRendererMetaData &data);
 
diff --git a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.h b/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.h
index 878aa4bb0..c547ef534 100644
--- a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.h
@@ -56,8 +56,8 @@ public:
     explicit MmRendererPlayerVideoRendererControl(QObject *parent = 0);
     ~MmRendererPlayerVideoRendererControl();
 
-    QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
-    void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
     // Called by media control
     void attachDisplay(mmr_context_t *context);
@@ -65,7 +65,7 @@ public:
     void pause();
     void resume();
 
-    void customEvent(QEvent *) Q_DECL_OVERRIDE;
+    void customEvent(QEvent *) override;
 
 private Q_SLOTS:
     void updateScene(const QSize &size);
diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.h b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.h
index 5bfd192bb..8327e259d 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.h
+++ b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.h
@@ -54,33 +54,33 @@ public:
     explicit MmRendererVideoWindowControl(QObject *parent = 0);
     ~MmRendererVideoWindowControl();
 
-    WId winId() const Q_DECL_OVERRIDE;
-    void setWinId(WId id) Q_DECL_OVERRIDE;
+    WId winId() const override;
+    void setWinId(WId id) override;
 
-    QRect displayRect() const Q_DECL_OVERRIDE;
-    void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE;
+    QRect displayRect() const override;
+    void setDisplayRect(const QRect &rect) override;
 
-    bool isFullScreen() const Q_DECL_OVERRIDE;
-    void setFullScreen(bool fullScreen) Q_DECL_OVERRIDE;
+    bool isFullScreen() const override;
+    void setFullScreen(bool fullScreen) override;
 
-    void repaint() Q_DECL_OVERRIDE;
+    void repaint() override;
 
-    QSize nativeSize() const Q_DECL_OVERRIDE;
+    QSize nativeSize() const override;
 
-    Qt::AspectRatioMode aspectRatioMode() const Q_DECL_OVERRIDE;
-    void setAspectRatioMode(Qt::AspectRatioMode mode) Q_DECL_OVERRIDE;
+    Qt::AspectRatioMode aspectRatioMode() const override;
+    void setAspectRatioMode(Qt::AspectRatioMode mode) override;
 
-    int brightness() const Q_DECL_OVERRIDE;
-    void setBrightness(int brightness) Q_DECL_OVERRIDE;
+    int brightness() const override;
+    void setBrightness(int brightness) override;
 
-    int contrast() const Q_DECL_OVERRIDE;
-    void setContrast(int contrast) Q_DECL_OVERRIDE;
+    int contrast() const override;
+    void setContrast(int contrast) override;
 
-    int hue() const Q_DECL_OVERRIDE;
-    void setHue(int hue) Q_DECL_OVERRIDE;
+    int hue() const override;
+    void setHue(int hue) override;
 
-    int saturation() const Q_DECL_OVERRIDE;
-    void setSaturation(int saturation) Q_DECL_OVERRIDE;
+    int saturation() const override;
+    void setSaturation(int saturation) override;
 
     //
     // Called by media control
diff --git a/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.h b/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.h
index eea8388bd..280494c75 100644
--- a/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.h
+++ b/src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.h
@@ -52,10 +52,10 @@ public:
     explicit PpsMediaPlayerControl(QObject *parent = 0);
     ~PpsMediaPlayerControl();
 
-    void startMonitoring(int contextId, const QString &contextName) Q_DECL_OVERRIDE;
-    void stopMonitoring() Q_DECL_OVERRIDE;
+    void startMonitoring(int contextId, const QString &contextName) override;
+    void stopMonitoring() override;
 
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
 
 private Q_SLOTS:
     void ppsReadyRead(int fd);
diff --git a/src/plugins/qnx/neutrinoserviceplugin.h b/src/plugins/qnx/neutrinoserviceplugin.h
index 6e4b6861e..62ed7f0bd 100644
--- a/src/plugins/qnx/neutrinoserviceplugin.h
+++ b/src/plugins/qnx/neutrinoserviceplugin.h
@@ -53,9 +53,9 @@ class NeutrinoServicePlugin
 public:
     NeutrinoServicePlugin();
 
-    QMediaService *create(const QString &key) Q_DECL_OVERRIDE;
-    void release(QMediaService *service) Q_DECL_OVERRIDE;
-    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const Q_DECL_OVERRIDE;
+    QMediaService *create(const QString &key) override;
+    void release(QMediaService *service) override;
+    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/wasapi/qwasapiaudiodeviceinfo.h b/src/plugins/wasapi/qwasapiaudiodeviceinfo.h
index 97966c171..878d0273a 100644
--- a/src/plugins/wasapi/qwasapiaudiodeviceinfo.h
+++ b/src/plugins/wasapi/qwasapiaudiodeviceinfo.h
@@ -61,15 +61,15 @@ public:
     explicit QWasapiAudioDeviceInfo(QByteArray dev,QAudio::Mode mode);
     ~QWasapiAudioDeviceInfo();
 
-    QAudioFormat preferredFormat() const Q_DECL_OVERRIDE;
-    bool isFormatSupported(const QAudioFormat& format) const Q_DECL_OVERRIDE;
-    QString deviceName() const Q_DECL_OVERRIDE;
-    QStringList supportedCodecs() Q_DECL_OVERRIDE;
-    QList<int> supportedSampleRates() Q_DECL_OVERRIDE;
-    QList<int> supportedChannelCounts() Q_DECL_OVERRIDE;
-    QList<int> supportedSampleSizes() Q_DECL_OVERRIDE;
-    QList<QAudioFormat::Endian> supportedByteOrders() Q_DECL_OVERRIDE;
-    QList<QAudioFormat::SampleType> supportedSampleTypes() Q_DECL_OVERRIDE;
+    QAudioFormat preferredFormat() const override;
+    bool isFormatSupported(const QAudioFormat& format) const override;
+    QString deviceName() const override;
+    QStringList supportedCodecs() override;
+    QList<int> supportedSampleRates() override;
+    QList<int> supportedChannelCounts() override;
+    QList<int> supportedSampleSizes() override;
+    QList<QAudioFormat::Endian> supportedByteOrders() override;
+    QList<QAudioFormat::SampleType> supportedSampleTypes() override;
 
 private:
     Microsoft::WRL::ComPtr<AudioInterface> m_interface;
diff --git a/src/plugins/wasapi/qwasapiaudioinput.h b/src/plugins/wasapi/qwasapiaudioinput.h
index 34ede06b7..babfb5b10 100644
--- a/src/plugins/wasapi/qwasapiaudioinput.h
+++ b/src/plugins/wasapi/qwasapiaudioinput.h
@@ -66,26 +66,26 @@ public:
     explicit QWasapiAudioInput(const QByteArray &device);
     ~QWasapiAudioInput();
 
-    void start(QIODevice* device) Q_DECL_OVERRIDE;
-    QIODevice* start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void suspend() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    int bytesReady() const Q_DECL_OVERRIDE;
-    int periodSize() const Q_DECL_OVERRIDE;
-    void setBufferSize(int value) Q_DECL_OVERRIDE;
-    int bufferSize() const Q_DECL_OVERRIDE;
-    void setNotifyInterval(int milliSeconds) Q_DECL_OVERRIDE;
-    int notifyInterval() const Q_DECL_OVERRIDE;
-    qint64 processedUSecs() const Q_DECL_OVERRIDE;
-    qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
-    QAudio::Error error() const Q_DECL_OVERRIDE;
-    QAudio::State state() const Q_DECL_OVERRIDE;
-    void setFormat(const QAudioFormat& fmt) Q_DECL_OVERRIDE;
-    QAudioFormat format() const Q_DECL_OVERRIDE;
-    void setVolume(qreal) Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
+    void start(QIODevice* device) override;
+    QIODevice* start() override;
+    void stop() override;
+    void reset() override;
+    void suspend() override;
+    void resume() override;
+    int bytesReady() const override;
+    int periodSize() const override;
+    void setBufferSize(int value) override;
+    int bufferSize() const override;
+    void setNotifyInterval(int milliSeconds) override;
+    int notifyInterval() const override;
+    qint64 processedUSecs() const override;
+    qint64 elapsedUSecs() const override;
+    QAudio::Error error() const override;
+    QAudio::State state() const override;
+    void setFormat(const QAudioFormat& fmt) override;
+    QAudioFormat format() const override;
+    void setVolume(qreal) override;
+    qreal volume() const override;
 
     void process();
 public slots:
diff --git a/src/plugins/wasapi/qwasapiaudiooutput.h b/src/plugins/wasapi/qwasapiaudiooutput.h
index 02974071b..49219c5cc 100644
--- a/src/plugins/wasapi/qwasapiaudiooutput.h
+++ b/src/plugins/wasapi/qwasapiaudiooutput.h
@@ -67,26 +67,26 @@ public:
     explicit QWasapiAudioOutput(const QByteArray &device);
     ~QWasapiAudioOutput();
 
-    void start(QIODevice* device) Q_DECL_OVERRIDE;
-    QIODevice* start() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void suspend() Q_DECL_OVERRIDE;
-    void resume() Q_DECL_OVERRIDE;
-    int bytesFree() const Q_DECL_OVERRIDE;
-    int periodSize() const Q_DECL_OVERRIDE;
-    void setBufferSize(int value) Q_DECL_OVERRIDE;
-    int bufferSize() const Q_DECL_OVERRIDE;
-    void setNotifyInterval(int milliSeconds) Q_DECL_OVERRIDE;
-    int notifyInterval() const Q_DECL_OVERRIDE;
-    qint64 processedUSecs() const Q_DECL_OVERRIDE;
-    qint64 elapsedUSecs() const Q_DECL_OVERRIDE;
-    QAudio::Error error() const Q_DECL_OVERRIDE;
-    QAudio::State state() const Q_DECL_OVERRIDE;
-    void setFormat(const QAudioFormat& fmt) Q_DECL_OVERRIDE;
-    QAudioFormat format() const Q_DECL_OVERRIDE;
-    void setVolume(qreal) Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
+    void start(QIODevice* device) override;
+    QIODevice* start() override;
+    void stop() override;
+    void reset() override;
+    void suspend() override;
+    void resume() override;
+    int bytesFree() const override;
+    int periodSize() const override;
+    void setBufferSize(int value) override;
+    int bufferSize() const override;
+    void setNotifyInterval(int milliSeconds) override;
+    int notifyInterval() const override;
+    qint64 processedUSecs() const override;
+    qint64 elapsedUSecs() const override;
+    QAudio::Error error() const override;
+    QAudio::State state() const override;
+    void setFormat(const QAudioFormat& fmt) override;
+    QAudioFormat format() const override;
+    void setVolume(qreal) override;
+    qreal volume() const override;
 
     void process();
 public slots:
diff --git a/src/plugins/wasapi/qwasapiplugin.h b/src/plugins/wasapi/qwasapiplugin.h
index e69e7895f..7b20676f6 100644
--- a/src/plugins/wasapi/qwasapiplugin.h
+++ b/src/plugins/wasapi/qwasapiplugin.h
@@ -60,11 +60,11 @@ public:
     explicit QWasapiPlugin(QObject *parent = 0);
     ~QWasapiPlugin() {}
 
-    QByteArray defaultDevice(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QList<QByteArray> availableDevices(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QAbstractAudioInput *createInput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioOutput *createOutput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(QAudio::Mode mode) const override;
+    QList<QByteArray> availableDevices(QAudio::Mode mode) const override;
+    QAbstractAudioInput *createInput(const QByteArray &device) override;
+    QAbstractAudioOutput *createOutput(const QByteArray &device) override;
+    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) override;
 
 private:
     QList<QByteArray> m_deviceNames;
diff --git a/src/plugins/windowsaudio/qwindowsaudioplugin.h b/src/plugins/windowsaudio/qwindowsaudioplugin.h
index 7b500a39c..a155ae082 100644
--- a/src/plugins/windowsaudio/qwindowsaudioplugin.h
+++ b/src/plugins/windowsaudio/qwindowsaudioplugin.h
@@ -56,11 +56,11 @@ public:
     QWindowsAudioPlugin(QObject *parent = 0);
     ~QWindowsAudioPlugin() {}
 
-    QByteArray defaultDevice(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QList<QByteArray> availableDevices(QAudio::Mode mode) const Q_DECL_OVERRIDE;
-    QAbstractAudioInput *createInput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioOutput *createOutput(const QByteArray &device) Q_DECL_OVERRIDE;
-    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(QAudio::Mode mode) const override;
+    QList<QByteArray> availableDevices(QAudio::Mode mode) const override;
+    QAbstractAudioInput *createInput(const QByteArray &device) override;
+    QAbstractAudioOutput *createOutput(const QByteArray &device) override;
+    QAbstractAudioDeviceInfo *createDeviceInfo(const QByteArray &device, QAudio::Mode mode) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
index b3fd11111..433601477 100644
--- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
+++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
@@ -149,12 +149,12 @@ public:
         create();
     }
 
-    MapMode mapMode() const Q_DECL_OVERRIDE
+    MapMode mapMode() const override
     {
         return NotMapped;
     }
 
-    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) Q_DECL_OVERRIDE
+    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override
     {
         Q_UNUSED(mode);
         Q_UNUSED(numBytes);
@@ -162,11 +162,11 @@ public:
         return 0;
     }
 
-    void unmap() Q_DECL_OVERRIDE
+    void unmap() override
     {
     }
 
-    QVariant handle() const Q_DECL_OVERRIDE
+    QVariant handle() const override
     {
         return QVariant::fromValue(textureId());
     }
diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
index a7ba2998a..8231fe9ab 100644
--- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
+++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
@@ -63,8 +63,8 @@ public:
         MediaFoundation
     };
 
-    QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
-    void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+    QAbstractVideoSurface *surface() const override;
+    void setSurface(QAbstractVideoSurface *surface) override;
 
     QSize size() const;
     void setSize(const QSize &size);
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index a28d57219..343903bc3 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -252,7 +252,7 @@ public:
         return S_OK;
     }
 
-    HRESULT __stdcall GetEvent(DWORD flags, IMFMediaEvent **event) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetEvent(DWORD flags, IMFMediaEvent **event) override
     {
         EnterCriticalSection(&m_mutex);
         // Create an extra reference to avoid deadlock
@@ -262,43 +262,43 @@ public:
         return eventQueue->GetEvent(flags, event);
     }
 
-    HRESULT __stdcall BeginGetEvent(IMFAsyncCallback *callback, IUnknown *state) Q_DECL_OVERRIDE
+    HRESULT __stdcall BeginGetEvent(IMFAsyncCallback *callback, IUnknown *state) override
     {
         CriticalSectionLocker locker(&m_mutex);
         HRESULT hr = m_eventQueue->BeginGetEvent(callback, state);
         return hr;
     }
 
-    HRESULT __stdcall EndGetEvent(IMFAsyncResult *result, IMFMediaEvent **event) Q_DECL_OVERRIDE
+    HRESULT __stdcall EndGetEvent(IMFAsyncResult *result, IMFMediaEvent **event) override
     {
         CriticalSectionLocker locker(&m_mutex);
         return m_eventQueue->EndGetEvent(result, event);
     }
 
-    HRESULT __stdcall QueueEvent(MediaEventType eventType, const GUID &extendedType, HRESULT status, const PROPVARIANT *value) Q_DECL_OVERRIDE
+    HRESULT __stdcall QueueEvent(MediaEventType eventType, const GUID &extendedType, HRESULT status, const PROPVARIANT *value) override
     {
         CriticalSectionLocker locker(&m_mutex);
         return m_eventQueue->QueueEventParamVar(eventType, extendedType, status, value);
     }
 
-    HRESULT __stdcall GetMediaSink(IMFMediaSink **mediaSink) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetMediaSink(IMFMediaSink **mediaSink) override
     {
         *mediaSink = m_sink;
         return S_OK;
     }
 
-    HRESULT __stdcall GetIdentifier(DWORD *identifier) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetIdentifier(DWORD *identifier) override
     {
         *identifier = 0;
         return S_OK;
     }
 
-    HRESULT __stdcall GetMediaTypeHandler(IMFMediaTypeHandler **handler) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetMediaTypeHandler(IMFMediaTypeHandler **handler) override
     {
         return QueryInterface(IID_PPV_ARGS(handler));
     }
 
-    HRESULT __stdcall ProcessSample(IMFSample *sample) Q_DECL_OVERRIDE
+    HRESULT __stdcall ProcessSample(IMFSample *sample) override
     {
         ComPtr<IMFMediaBuffer> buffer;
         HRESULT hr = sample->GetBufferByIndex(0, &buffer);
@@ -313,7 +313,7 @@ public:
         return hr;
     }
 
-    HRESULT __stdcall PlaceMarker(MFSTREAMSINK_MARKER_TYPE type, const PROPVARIANT *value, const PROPVARIANT *context) Q_DECL_OVERRIDE
+    HRESULT __stdcall PlaceMarker(MFSTREAMSINK_MARKER_TYPE type, const PROPVARIANT *value, const PROPVARIANT *context) override
     {
         Q_UNUSED(type);
         Q_UNUSED(value);
@@ -321,14 +321,14 @@ public:
         return S_OK;
     }
 
-    HRESULT __stdcall Flush() Q_DECL_OVERRIDE
+    HRESULT __stdcall Flush() override
     {
         m_videoRenderer->discardBuffers();
         m_pendingSamples.store(0);
         return S_OK;
     }
 
-    HRESULT __stdcall IsMediaTypeSupported(IMFMediaType *type, IMFMediaType **) Q_DECL_OVERRIDE
+    HRESULT __stdcall IsMediaTypeSupported(IMFMediaType *type, IMFMediaType **) override
     {
         HRESULT hr;
         GUID majorType;
@@ -339,20 +339,20 @@ public:
         return S_OK;
     }
 
-    HRESULT __stdcall GetMediaTypeCount(DWORD *typeCount) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetMediaTypeCount(DWORD *typeCount) override
     {
         *typeCount = 1;
         return S_OK;
     }
 
-    HRESULT __stdcall GetMediaTypeByIndex(DWORD index, IMFMediaType **type) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetMediaTypeByIndex(DWORD index, IMFMediaType **type) override
     {
         if (index == 0)
             return m_type.CopyTo(type);
         return E_BOUNDS;
     }
 
-    HRESULT __stdcall SetCurrentMediaType(IMFMediaType *type) Q_DECL_OVERRIDE
+    HRESULT __stdcall SetCurrentMediaType(IMFMediaType *type) override
     {
         if (FAILED(IsMediaTypeSupported(type, Q_NULLPTR)))
             return MF_E_INVALIDREQUEST;
@@ -361,12 +361,12 @@ public:
         return S_OK;
     }
 
-    HRESULT __stdcall GetCurrentMediaType(IMFMediaType **type) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetCurrentMediaType(IMFMediaType **type) override
     {
         return m_type.CopyTo(type);
     }
 
-    HRESULT __stdcall GetMajorType(GUID *majorType) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetMajorType(GUID *majorType) override
     {
         return m_type->GetMajorType(majorType);
     }
@@ -407,19 +407,19 @@ public:
         return m_stream->RequestSample();
     }
 
-    HRESULT __stdcall SetProperties(Collections::IPropertySet *configuration) Q_DECL_OVERRIDE
+    HRESULT __stdcall SetProperties(Collections::IPropertySet *configuration) override
     {
         Q_UNUSED(configuration);
         return E_NOTIMPL;
     }
 
-    HRESULT __stdcall GetCharacteristics(DWORD *characteristics) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetCharacteristics(DWORD *characteristics) override
     {
         *characteristics = MEDIASINK_FIXED_STREAMS | MEDIASINK_RATELESS;
         return S_OK;
     }
 
-    HRESULT __stdcall AddStreamSink(DWORD streamSinkIdentifier, IMFMediaType *mediaType, IMFStreamSink **streamSink) Q_DECL_OVERRIDE
+    HRESULT __stdcall AddStreamSink(DWORD streamSinkIdentifier, IMFMediaType *mediaType, IMFStreamSink **streamSink) override
     {
         Q_UNUSED(streamSinkIdentifier);
         Q_UNUSED(mediaType);
@@ -427,33 +427,33 @@ public:
         return E_NOTIMPL;
     }
 
-    HRESULT __stdcall RemoveStreamSink(DWORD streamSinkIdentifier) Q_DECL_OVERRIDE
+    HRESULT __stdcall RemoveStreamSink(DWORD streamSinkIdentifier) override
     {
         Q_UNUSED(streamSinkIdentifier);
         return E_NOTIMPL;
     }
 
-    HRESULT __stdcall GetStreamSinkCount(DWORD *streamSinkCount) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetStreamSinkCount(DWORD *streamSinkCount) override
     {
         *streamSinkCount = 1;
         return S_OK;
     }
 
-    HRESULT __stdcall GetStreamSinkByIndex(DWORD index, IMFStreamSink **streamSink) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetStreamSinkByIndex(DWORD index, IMFStreamSink **streamSink) override
     {
         if (index == 0)
             return m_stream.CopyTo(streamSink);
         return MF_E_INVALIDINDEX;
     }
 
-    HRESULT __stdcall GetStreamSinkById(DWORD streamSinkIdentifier, IMFStreamSink **streamSink) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetStreamSinkById(DWORD streamSinkIdentifier, IMFStreamSink **streamSink) override
     {
         // ID and index are always 0
         HRESULT hr = GetStreamSinkByIndex(streamSinkIdentifier, streamSink);
         return hr == MF_E_INVALIDINDEX ? MF_E_INVALIDSTREAMNUMBER : hr;
     }
 
-    HRESULT __stdcall SetPresentationClock(IMFPresentationClock *presentationClock) Q_DECL_OVERRIDE
+    HRESULT __stdcall SetPresentationClock(IMFPresentationClock *presentationClock) override
     {
         HRESULT hr = S_OK;
         m_presentationClock = presentationClock;
@@ -462,19 +462,19 @@ public:
         return hr;
     }
 
-    HRESULT __stdcall GetPresentationClock(IMFPresentationClock **presentationClock) Q_DECL_OVERRIDE
+    HRESULT __stdcall GetPresentationClock(IMFPresentationClock **presentationClock) override
     {
         return m_presentationClock.CopyTo(presentationClock);
     }
 
-    HRESULT __stdcall Shutdown() Q_DECL_OVERRIDE
+    HRESULT __stdcall Shutdown() override
     {
         m_stream->Flush();
         scheduleSetActive(false);
         return m_presentationClock ? m_presentationClock->Stop() : S_OK;
     }
 
-    HRESULT __stdcall OnClockStart(MFTIME systemTime, LONGLONG clockStartOffset) Q_DECL_OVERRIDE
+    HRESULT __stdcall OnClockStart(MFTIME systemTime, LONGLONG clockStartOffset) override
     {
         Q_UNUSED(systemTime);
         Q_UNUSED(clockStartOffset);
@@ -484,7 +484,7 @@ public:
         return S_OK;
     }
 
-    HRESULT __stdcall OnClockStop(MFTIME systemTime) Q_DECL_OVERRIDE
+    HRESULT __stdcall OnClockStop(MFTIME systemTime) override
     {
         Q_UNUSED(systemTime);
 
@@ -493,7 +493,7 @@ public:
         return m_stream->QueueEvent(MEStreamSinkStopped, GUID_NULL, S_OK, Q_NULLPTR);
     }
 
-    HRESULT __stdcall OnClockPause(MFTIME systemTime) Q_DECL_OVERRIDE
+    HRESULT __stdcall OnClockPause(MFTIME systemTime) override
     {
         Q_UNUSED(systemTime);
 
@@ -502,7 +502,7 @@ public:
         return m_stream->QueueEvent(MEStreamSinkPaused, GUID_NULL, S_OK, Q_NULLPTR);
     }
 
-    HRESULT __stdcall OnClockRestart(MFTIME systemTime) Q_DECL_OVERRIDE
+    HRESULT __stdcall OnClockRestart(MFTIME systemTime) override
     {
         Q_UNUSED(systemTime);
 
@@ -511,7 +511,7 @@ public:
         return m_stream->QueueEvent(MEStreamSinkStarted, GUID_NULL, S_OK, Q_NULLPTR);
     }
 
-    HRESULT __stdcall OnClockSetRate(MFTIME systemTime, float rate) Q_DECL_OVERRIDE
+    HRESULT __stdcall OnClockSetRate(MFTIME systemTime, float rate) override
     {
         Q_UNUSED(systemTime);
         Q_UNUSED(rate);
diff --git a/src/plugins/winrt/qwinrtcameracontrol.h b/src/plugins/winrt/qwinrtcameracontrol.h
index f978a8b2c..a24cd462c 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.h
+++ b/src/plugins/winrt/qwinrtcameracontrol.h
@@ -81,16 +81,16 @@ public:
     explicit QWinRTCameraControl(QObject *parent = 0);
     ~QWinRTCameraControl();
 
-    QCamera::State state() const Q_DECL_OVERRIDE;
-    void setState(QCamera::State state) Q_DECL_OVERRIDE;
+    QCamera::State state() const override;
+    void setState(QCamera::State state) override;
 
-    QCamera::Status status() const Q_DECL_OVERRIDE;
+    QCamera::Status status() const override;
 
-    QCamera::CaptureModes captureMode() const Q_DECL_OVERRIDE;
-    void setCaptureMode(QCamera::CaptureModes mode) Q_DECL_OVERRIDE;
-    bool isCaptureModeSupported(QCamera::CaptureModes mode) const Q_DECL_OVERRIDE;
+    QCamera::CaptureModes captureMode() const override;
+    void setCaptureMode(QCamera::CaptureModes mode) override;
+    bool isCaptureModeSupported(QCamera::CaptureModes mode) const override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const Q_DECL_OVERRIDE;
+    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
 
     QVideoRendererControl *videoRenderer() const;
     QVideoDeviceSelectorControl *videoDeviceSelector() const;
diff --git a/src/plugins/winrt/qwinrtcameraflashcontrol.h b/src/plugins/winrt/qwinrtcameraflashcontrol.h
index 335329037..b9be69230 100644
--- a/src/plugins/winrt/qwinrtcameraflashcontrol.h
+++ b/src/plugins/winrt/qwinrtcameraflashcontrol.h
@@ -62,11 +62,11 @@ public:
 
     void initialize(Microsoft::WRL::ComPtr<ABI::Windows::Media::Devices::IAdvancedVideoCaptureDeviceController2> &controller);
 
-    QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE;
-    void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE;
-    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE;
+    QCameraExposure::FlashModes flashMode() const override;
+    void setFlashMode(QCameraExposure::FlashModes mode) override;
+    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override;
 
-    bool isFlashReady() const Q_DECL_OVERRIDE;
+    bool isFlashReady() const override;
 
 private:
     QScopedPointer<QWinRTCameraFlashControlPrivate> d_ptr;
diff --git a/src/plugins/winrt/qwinrtcamerafocuscontrol.h b/src/plugins/winrt/qwinrtcamerafocuscontrol.h
index 0a8c0afcf..fcfb84edc 100644
--- a/src/plugins/winrt/qwinrtcamerafocuscontrol.h
+++ b/src/plugins/winrt/qwinrtcamerafocuscontrol.h
@@ -51,15 +51,15 @@ class QWinRTCameraFocusControl : public QCameraFocusControl
 public:
     explicit QWinRTCameraFocusControl(QWinRTCameraControl *parent);
 
-    QCameraFocus::FocusModes focusMode() const Q_DECL_OVERRIDE;
-    void setFocusMode(QCameraFocus::FocusModes mode) Q_DECL_OVERRIDE;
-    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const Q_DECL_OVERRIDE;
-    QCameraFocus::FocusPointMode focusPointMode() const Q_DECL_OVERRIDE;
-    void setFocusPointMode(QCameraFocus::FocusPointMode mode) Q_DECL_OVERRIDE;
-    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Q_DECL_OVERRIDE;
-    QPointF customFocusPoint() const Q_DECL_OVERRIDE;
-    void setCustomFocusPoint(const QPointF &point) Q_DECL_OVERRIDE;
-    QCameraFocusZoneList focusZones() const Q_DECL_OVERRIDE;
+    QCameraFocus::FocusModes focusMode() const override;
+    void setFocusMode(QCameraFocus::FocusModes mode) override;
+    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override;
+    QCameraFocus::FocusPointMode focusPointMode() const override;
+    void setFocusPointMode(QCameraFocus::FocusPointMode mode) override;
+    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const override;
+    QPointF customFocusPoint() const override;
+    void setCustomFocusPoint(const QPointF &point) override;
+    QCameraFocusZoneList focusZones() const override;
 
     void setSupportedFocusMode(QCameraFocus::FocusModes flag);
     void setSupportedFocusPointMode(const QSet<QCameraFocus::FocusPointMode> &supportedFocusPointModes);
diff --git a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h
index 3820bfaf1..ce1404e1c 100644
--- a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h
+++ b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.h
@@ -64,13 +64,13 @@ class QWinRTCameraImageCaptureControl : public QCameraImageCaptureControl
 public:
     explicit QWinRTCameraImageCaptureControl(QWinRTCameraControl *parent);
 
-    bool isReadyForCapture() const Q_DECL_OVERRIDE;
+    bool isReadyForCapture() const override;
 
-    QCameraImageCapture::DriveMode driveMode() const Q_DECL_OVERRIDE;
-    void setDriveMode(QCameraImageCapture::DriveMode mode) Q_DECL_OVERRIDE;
+    QCameraImageCapture::DriveMode driveMode() const override;
+    void setDriveMode(QCameraImageCapture::DriveMode mode) override;
 
-    int capture(const QString &fileName) Q_DECL_OVERRIDE;
-    void cancelCapture() Q_DECL_OVERRIDE;
+    int capture(const QString &fileName) override;
+    void cancelCapture() override;
 
 private slots:
     void onCameraStateChanged(QCamera::State state);
diff --git a/src/plugins/winrt/qwinrtcamerainfocontrol.h b/src/plugins/winrt/qwinrtcamerainfocontrol.h
index b97025dcb..031ed2720 100644
--- a/src/plugins/winrt/qwinrtcamerainfocontrol.h
+++ b/src/plugins/winrt/qwinrtcamerainfocontrol.h
@@ -50,8 +50,8 @@ class QWinRTCameraInfoControl : public QCameraInfoControl
 public:
     explicit QWinRTCameraInfoControl(QObject *parent = 0);
 
-    QCamera::Position cameraPosition(const QString &deviceName) const Q_DECL_OVERRIDE;
-    int cameraOrientation(const QString &deviceName) const Q_DECL_OVERRIDE;
+    QCamera::Position cameraPosition(const QString &deviceName) const override;
+    int cameraOrientation(const QString &deviceName) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/winrt/qwinrtcameralockscontrol.h b/src/plugins/winrt/qwinrtcameralockscontrol.h
index 873c355b0..61015fdaa 100644
--- a/src/plugins/winrt/qwinrtcameralockscontrol.h
+++ b/src/plugins/winrt/qwinrtcameralockscontrol.h
@@ -51,10 +51,10 @@ class QWinRTCameraLocksControl : public QCameraLocksControl
 public:
     explicit QWinRTCameraLocksControl(QObject *parent);
 
-    QCamera::LockTypes supportedLocks() const Q_DECL_OVERRIDE;
-    QCamera::LockStatus lockStatus(QCamera::LockType lock) const Q_DECL_OVERRIDE;
-    void searchAndLock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
-    void unlock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
+    QCamera::LockTypes supportedLocks() const override;
+    QCamera::LockStatus lockStatus(QCamera::LockType lock) const override;
+    void searchAndLock(QCamera::LockTypes locks) override;
+    void unlock(QCamera::LockTypes locks) override;
     void initialize();
 
 private:
diff --git a/src/plugins/winrt/qwinrtcameraservice.h b/src/plugins/winrt/qwinrtcameraservice.h
index beae2a140..6fa4d5fce 100644
--- a/src/plugins/winrt/qwinrtcameraservice.h
+++ b/src/plugins/winrt/qwinrtcameraservice.h
@@ -51,8 +51,8 @@ class QWinRTCameraService : public QMediaService
 public:
     explicit QWinRTCameraService(QObject *parent = 0);
 
-    QMediaControl *requestControl(const char *name) Q_DECL_OVERRIDE;
-    void releaseControl(QMediaControl *control) Q_DECL_OVERRIDE;
+    QMediaControl *requestControl(const char *name) override;
+    void releaseControl(QMediaControl *control) override;
 
 private:
     QScopedPointer<QWinRTCameraServicePrivate> d_ptr;
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
index 5f7810060..0a5ae46fa 100644
--- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
@@ -89,12 +89,12 @@ public:
         unmap();
     }
 
-    MapMode mapMode() const Q_DECL_OVERRIDE
+    MapMode mapMode() const override
     {
         return currentMode;
     }
 
-    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) Q_DECL_OVERRIDE
+    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override
     {
         if (currentMode != NotMapped || mode == NotMapped || control && control->state() != QCamera::ActiveState)
             return nullptr;
@@ -113,7 +113,7 @@ public:
         return bytes;
     }
 
-    void unmap() Q_DECL_OVERRIDE
+    void unmap() override
     {
         if (currentMode == NotMapped)
             return;
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h
index ec6e0e0e4..eeda83d52 100644
--- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h
+++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h
@@ -58,8 +58,8 @@ public:
     explicit QWinRTCameraVideoRendererControl(const QSize &size, QObject *parent);
     ~QWinRTCameraVideoRendererControl();
 
-    bool render(ID3D11Texture2D *texture) Q_DECL_OVERRIDE;
-    bool dequeueFrame(QVideoFrame *frame) Q_DECL_OVERRIDE;
+    bool render(ID3D11Texture2D *texture) override;
+    bool dequeueFrame(QVideoFrame *frame) override;
     void queueBuffer(IMF2DBuffer *buffer);
     void discardBuffers();
     void incrementProbe();
diff --git a/src/plugins/winrt/qwinrtimageencodercontrol.h b/src/plugins/winrt/qwinrtimageencodercontrol.h
index 7b0781798..dbeac2384 100644
--- a/src/plugins/winrt/qwinrtimageencodercontrol.h
+++ b/src/plugins/winrt/qwinrtimageencodercontrol.h
@@ -51,11 +51,11 @@ class QWinRTImageEncoderControl : public QImageEncoderControl
 public:
     explicit QWinRTImageEncoderControl(QObject *parent = 0);
 
-    QStringList supportedImageCodecs() const Q_DECL_OVERRIDE;
-    QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
-    void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedImageCodecs() const override;
+    QString imageCodecDescription(const QString &codecName) const override;
+    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const override;
+    QImageEncoderSettings imageSettings() const override;
+    void setImageSettings(const QImageEncoderSettings &settings) override;
 
     void setSupportedResolutionsList(const QList<QSize> resolution);
     void applySettings();
diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.h b/src/plugins/winrt/qwinrtmediaplayercontrol.h
index 3d4154093..1e854f5bb 100644
--- a/src/plugins/winrt/qwinrtmediaplayercontrol.h
+++ b/src/plugins/winrt/qwinrtmediaplayercontrol.h
@@ -56,39 +56,39 @@ public:
     QWinRTMediaPlayerControl(IMFMediaEngineClassFactory *factory, QObject *parent = 0);
     ~QWinRTMediaPlayerControl();
 
-    QMediaPlayer::State state() const Q_DECL_OVERRIDE;
-    QMediaPlayer::MediaStatus mediaStatus() const Q_DECL_OVERRIDE;
+    QMediaPlayer::State state() const override;
+    QMediaPlayer::MediaStatus mediaStatus() const override;
 
-    qint64 duration() const Q_DECL_OVERRIDE;
+    qint64 duration() const override;
 
-    qint64 position() const Q_DECL_OVERRIDE;
-    void setPosition(qint64 position) Q_DECL_OVERRIDE;
+    qint64 position() const override;
+    void setPosition(qint64 position) override;
 
-    int volume() const Q_DECL_OVERRIDE;
-    void setVolume(int volume) Q_DECL_OVERRIDE;
+    int volume() const override;
+    void setVolume(int volume) override;
 
-    bool isMuted() const Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
+    bool isMuted() const override;
+    void setMuted(bool muted) override;
 
-    int bufferStatus() const Q_DECL_OVERRIDE;
+    int bufferStatus() const override;
 
-    bool isAudioAvailable() const Q_DECL_OVERRIDE;
-    bool isVideoAvailable() const Q_DECL_OVERRIDE;
+    bool isAudioAvailable() const override;
+    bool isVideoAvailable() const override;
 
-    bool isSeekable() const Q_DECL_OVERRIDE;
+    bool isSeekable() const override;
 
-    QMediaTimeRange availablePlaybackRanges() const Q_DECL_OVERRIDE;
+    QMediaTimeRange availablePlaybackRanges() const override;
 
-    qreal playbackRate() const Q_DECL_OVERRIDE;
-    void setPlaybackRate(qreal rate) Q_DECL_OVERRIDE;
+    qreal playbackRate() const override;
+    void setPlaybackRate(qreal rate) override;
 
-    QMediaContent media() const Q_DECL_OVERRIDE;
-    const QIODevice *mediaStream() const Q_DECL_OVERRIDE;
-    void setMedia(const QMediaContent &media, QIODevice *stream) Q_DECL_OVERRIDE;
+    QMediaContent media() const override;
+    const QIODevice *mediaStream() const override;
+    void setMedia(const QMediaContent &media, QIODevice *stream) override;
 
-    void play() Q_DECL_OVERRIDE;
-    void pause() Q_DECL_OVERRIDE;
-    void stop() Q_DECL_OVERRIDE;
+    void play() override;
+    void pause() override;
+    void stop() override;
 
     QVideoRendererControl *videoRendererControl();
 
diff --git a/src/plugins/winrt/qwinrtplayerrenderercontrol.h b/src/plugins/winrt/qwinrtplayerrenderercontrol.h
index fb67d0c8c..70f3c4af2 100644
--- a/src/plugins/winrt/qwinrtplayerrenderercontrol.h
+++ b/src/plugins/winrt/qwinrtplayerrenderercontrol.h
@@ -58,7 +58,7 @@ public:
 
     bool ensureReady();
 
-    bool render(ID3D11Texture2D *texture) Q_DECL_OVERRIDE;
+    bool render(ID3D11Texture2D *texture) override;
 
 private:
     QScopedPointer<QWinRTPlayerRendererControlPrivate> d_ptr;
diff --git a/src/plugins/winrt/qwinrtserviceplugin.h b/src/plugins/winrt/qwinrtserviceplugin.h
index d6600aa54..30a76022d 100644
--- a/src/plugins/winrt/qwinrtserviceplugin.h
+++ b/src/plugins/winrt/qwinrtserviceplugin.h
@@ -62,13 +62,13 @@ public:
 
     QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
 
-    QCamera::Position cameraPosition(const QByteArray &device) const Q_DECL_OVERRIDE;
-    int cameraOrientation(const QByteArray &device) const Q_DECL_OVERRIDE;
+    QCamera::Position cameraPosition(const QByteArray &device) const override;
+    int cameraOrientation(const QByteArray &device) const override;
 
-    QList<QByteArray> devices(const QByteArray &service) const Q_DECL_OVERRIDE;
-    QString deviceDescription(const QByteArray &service, const QByteArray &device) Q_DECL_OVERRIDE;
+    QList<QByteArray> devices(const QByteArray &service) const override;
+    QString deviceDescription(const QByteArray &service, const QByteArray &device) override;
 
-    QByteArray defaultDevice(const QByteArray &service) const Q_DECL_OVERRIDE;
+    QByteArray defaultDevice(const QByteArray &service) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h
index 36f00656c..3beb9782a 100644
--- a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h
+++ b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h
@@ -65,13 +65,13 @@ public:
     explicit QWinRTVideoDeviceSelectorControl(QObject *parent = 0);
     ~QWinRTVideoDeviceSelectorControl();
 
-    int deviceCount() const Q_DECL_OVERRIDE;
+    int deviceCount() const override;
 
-    QString deviceName(int index) const Q_DECL_OVERRIDE;
-    QString deviceDescription(int index) const Q_DECL_OVERRIDE;
+    QString deviceName(int index) const override;
+    QString deviceDescription(int index) const override;
 
-    int defaultDevice() const Q_DECL_OVERRIDE;
-    int selectedDevice() const Q_DECL_OVERRIDE;
+    int defaultDevice() const override;
+    int selectedDevice() const override;
 
     static QCamera::Position cameraPosition(const QString &deviceName);
     static int cameraOrientation(const QString &deviceName);
@@ -80,7 +80,7 @@ public:
     static QByteArray defaultDeviceName();
 
 public slots:
-    void setSelectedDevice(int index) Q_DECL_OVERRIDE;
+    void setSelectedDevice(int index) override;
 
 private:
     QScopedPointer<QWinRTVideoDeviceSelectorControlPrivate> d_ptr;
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
index 412694cc3..8cd331495 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
@@ -130,7 +130,7 @@ class FilterRunnableDeleter : public QRunnable
 {
 public:
     FilterRunnableDeleter(const QList<QVideoFilterRunnable *> &runnables) : m_runnables(runnables) { }
-    void run() Q_DECL_OVERRIDE {
+    void run() override {
         for (QVideoFilterRunnable *runnable : qAsConst(m_runnables))
             delete runnable;
     }
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
index c84612960..4f1a90c8b 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render_p.h
@@ -74,25 +74,25 @@ public:
     QDeclarativeVideoRendererBackend(QDeclarativeVideoOutput *parent);
     ~QDeclarativeVideoRendererBackend();
 
-    bool init(QMediaService *service) Q_DECL_OVERRIDE;
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) Q_DECL_OVERRIDE;
-    void releaseSource() Q_DECL_OVERRIDE;
-    void releaseControl() Q_DECL_OVERRIDE;
-    QSize nativeSize() const Q_DECL_OVERRIDE;
-    void updateGeometry() Q_DECL_OVERRIDE;
-    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
-    QAbstractVideoSurface *videoSurface() const Q_DECL_OVERRIDE;
-    QRectF adjustedViewport() const Q_DECL_OVERRIDE;
+    bool init(QMediaService *service) override;
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) override;
+    void releaseSource() override;
+    void releaseControl() override;
+    QSize nativeSize() const override;
+    void updateGeometry() override;
+    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override;
+    QAbstractVideoSurface *videoSurface() const override;
+    QRectF adjustedViewport() const override;
     QOpenGLContext *glContext() const;
 
     friend class QSGVideoItemSurface;
     void present(const QVideoFrame &frame);
     void stop();
 
-    void appendFilter(QAbstractVideoFilter *filter) Q_DECL_OVERRIDE;
-    void clearFilters() Q_DECL_OVERRIDE;
-    void releaseResources() Q_DECL_OVERRIDE;
-    void invalidateSceneGraph() Q_DECL_OVERRIDE;
+    void appendFilter(QAbstractVideoFilter *filter) override;
+    void clearFilters() override;
+    void releaseResources() override;
+    void invalidateSceneGraph() override;
 
 private:
     void scheduleDeleteFilterResources();
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
index 942cc18d9..eb1814b07 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_window_p.h
@@ -63,15 +63,15 @@ public:
     QDeclarativeVideoWindowBackend(QDeclarativeVideoOutput *parent);
     ~QDeclarativeVideoWindowBackend();
 
-    bool init(QMediaService *service) Q_DECL_OVERRIDE;
-    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) Q_DECL_OVERRIDE;
-    void releaseSource() Q_DECL_OVERRIDE;
-    void releaseControl() Q_DECL_OVERRIDE;
-    QSize nativeSize() const Q_DECL_OVERRIDE;
-    void updateGeometry() Q_DECL_OVERRIDE;
-    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
-    QAbstractVideoSurface *videoSurface() const Q_DECL_OVERRIDE;
-    QRectF adjustedViewport() const Q_DECL_OVERRIDE;
+    bool init(QMediaService *service) override;
+    void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &changeData) override;
+    void releaseSource() override;
+    void releaseControl() override;
+    QSize nativeSize() const override;
+    void updateGeometry() override;
+    QSGNode *updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *data) override;
+    QAbstractVideoSurface *videoSurface() const override;
+    QRectF adjustedViewport() const override;
 
 private:
     QPointer<QVideoWindowControl> m_videoWindowControl;
diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
index 38b5af943..54d6dec97 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
@@ -120,9 +120,9 @@ public:
         setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/uyvyvideo.frag"));
     }
 
-    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE;
+    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
 
-    char const *const *attributeNames() const Q_DECL_OVERRIDE {
+    char const *const *attributeNames() const override {
         static const char *names[] = {
             "qt_VertexPosition",
             "qt_VertexTexCoord",
@@ -132,7 +132,7 @@ public:
     }
 
 protected:
-    void initialize() Q_DECL_OVERRIDE {
+    void initialize() override {
         m_id_matrix = program()->uniformLocation("qt_Matrix");
         m_id_yuvtexture = program()->uniformLocation("yuvTexture");
         m_id_imageWidth = program()->uniformLocation("imageWidth");