Replace Q_DECL_OVERRIDE with override

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

23 files changed, 133 insertions, 133 deletions

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