Replace Q_DECL_OVERRIDE with override

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

27 files changed, 148 insertions, 148 deletions

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