Q_DECL_OVERRIDE -> override

Change-Id: Ib46f35685a411be1546e3e93b626f41796eafa67
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

77 files changed, 147 insertions, 147 deletions

diff --git a/src/qmlandroid/app/qqmlandroidactionbar_p.h b/src/qmlandroid/app/qqmlandroidactionbar_p.h
index 5cda2ea..2bc70a2 100644
--- a/src/qmlandroid/app/qqmlandroidactionbar_p.h
+++ b/src/qmlandroid/app/qqmlandroidactionbar_p.h
@@ -90,9 +90,9 @@ Q_SIGNALS:
     void backgroundChanged();
 
 protected:
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    void onInflate(QAndroidJniObject &instance) override;
 
-    void objectChange(ObjectChange change) Q_DECL_OVERRIDE;
+    void objectChange(ObjectChange change) override;
 
 private Q_SLOTS:
     void updateBackground();
diff --git a/src/qmlandroid/app/qqmlandroidactivity_p.h b/src/qmlandroid/app/qqmlandroidactivity_p.h
index abc4c9c..58d119f 100644
--- a/src/qmlandroid/app/qqmlandroidactivity_p.h
+++ b/src/qmlandroid/app/qqmlandroidactivity_p.h
@@ -80,8 +80,8 @@ public:
     void setContentView(QQmlAndroidView *view);
 
 protected:
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
 private Q_SLOTS:
     void setupWindow();
diff --git a/src/qmlandroid/app/qqmlandroidalertdialog_p.h b/src/qmlandroid/app/qqmlandroidalertdialog_p.h
index 53b5214..129a1c1 100644
--- a/src/qmlandroid/app/qqmlandroidalertdialog_p.h
+++ b/src/qmlandroid/app/qqmlandroidalertdialog_p.h
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void messageChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject& instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject& instance) override;
 
 private:
     QString m_title;
diff --git a/src/qmlandroid/app/qqmlandroiddialog_p.h b/src/qmlandroid/app/qqmlandroiddialog_p.h
index 3630dec..fdacdfe 100644
--- a/src/qmlandroid/app/qqmlandroiddialog_p.h
+++ b/src/qmlandroid/app/qqmlandroiddialog_p.h
@@ -66,8 +66,8 @@ public Q_SLOTS:
     void show();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject& instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject& instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/app/qqmlandroidservice_p.h b/src/qmlandroid/app/qqmlandroidservice_p.h
index abf37d3..8c5c01e 100644
--- a/src/qmlandroid/app/qqmlandroidservice_p.h
+++ b/src/qmlandroid/app/qqmlandroidservice_p.h
@@ -73,8 +73,8 @@ Q_SIGNALS:
     void stopped();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject& instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject& instance) override;
 
     static void onRegisterNativeMethods(jobject service);
     static void onCreated(JNIEnv *env, jobject object, jlong instance);
diff --git a/src/qmlandroid/content/qqmlandroidcontextual_p.h b/src/qmlandroid/content/qqmlandroidcontextual_p.h
index 1555022..de9691b 100644
--- a/src/qmlandroid/content/qqmlandroidcontextual_p.h
+++ b/src/qmlandroid/content/qqmlandroidcontextual_p.h
@@ -71,7 +71,7 @@ Q_SIGNALS:
     void contextChanged();
 
 protected:
-    void componentComplete() Q_DECL_OVERRIDE;
+    void componentComplete() override;
 
 private Q_SLOTS:
     bool initContext(QQmlAndroidContext *context = nullptr);
diff --git a/src/qmlandroid/core/qqmlandroidobject_p.h b/src/qmlandroid/core/qqmlandroidobject_p.h
index 6d6acf3..17056c9 100644
--- a/src/qmlandroid/core/qqmlandroidobject_p.h
+++ b/src/qmlandroid/core/qqmlandroidobject_p.h
@@ -91,8 +91,8 @@ protected:
     virtual void onInflate(QAndroidJniObject &instance);
 
     bool isComponentComplete() const;
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
     virtual void objectChange(ObjectChange change);
 
@@ -100,7 +100,7 @@ protected:
     static int data_count(QQmlListProperty<QObject> *list);
     static QObject *data_at(QQmlListProperty<QObject> *list, int index);
 
-    void childEvent(QChildEvent *event) Q_DECL_OVERRIDE;
+    void childEvent(QChildEvent *event) override;
 
 private Q_SLOTS:
     void changeInstance();
diff --git a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h
index 48a696a..b0bf19f 100644
--- a/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h
+++ b/src/qmlandroid/graphics/drawable/qqmlandroidcolordrawable_p.h
@@ -68,8 +68,8 @@ Q_SIGNALS:
     void colorChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     int m_color;
diff --git a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h
index 88a7846..52f2386 100644
--- a/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h
+++ b/src/qmlandroid/graphics/drawable/qqmlandroiddrawable_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidDrawable(QObject *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h
index 1781fa8..cb9dd84 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h
+++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayout_p.h
@@ -67,8 +67,8 @@ public Q_SLOTS:
     void closeDrawer(int gravity);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
index ca5dc65..54816f4 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
+++ b/src/qmlandroid/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void gravityChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     int m_gravity;
diff --git a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
index 6a65be8..79b9f51 100644
--- a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
+++ b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void refreshingChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onRefresh(JNIEnv *env, jobject object, jlong instance);
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h
index 48adc88..6916eda 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidcardview_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidCardView(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h
index bc9555f..1e2b9ea 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter_p.h
@@ -75,8 +75,8 @@ Q_SIGNALS:
     void delegateChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject adapter);
     static jobject onCreateViewHolder(JNIEnv *env, jobject object, jlong instance, jobject parent, jint viewType);
diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h
index cfb3d1d..a56a5cd 100644
--- a/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h
+++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecyclerview_p.h
@@ -69,10 +69,10 @@ Q_SIGNALS:
     void adapterChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject& instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject& instance) override;
 
-    void objectChange(ObjectChange change) Q_DECL_OVERRIDE;
+    void objectChange(ObjectChange change) override;
 
 private Q_SLOTS:
     void updateAdapter();
diff --git a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
index 2864828..91a9055 100644
--- a/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
@@ -65,7 +65,7 @@ public:
 Q_SIGNALS:
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
 };
diff --git a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h
index 92a257f..ab2ab14 100644
--- a/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidaccelerateinterpolator_p.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void factorChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_factor;
diff --git a/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h
index 121863d..0bddd50 100644
--- a/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidalphaanimation_p.h
@@ -72,7 +72,7 @@ Q_SIGNALS:
     void toAlphaChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     qreal m_fromAlpha;
diff --git a/src/qmlandroid/view/animation/qqmlandroidanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidanimation_p.h
index e49d860..47717e6 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanimation_p.h
@@ -142,10 +142,10 @@ Q_SIGNALS:
     void zAdjustmentChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
-    void objectChange(ObjectChange change) Q_DECL_OVERRIDE;
+    void objectChange(ObjectChange change) override;
 
 private Q_SLOTS:
     void updateInterpolator();
diff --git a/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h b/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h
index 0efd872..2891e86 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanimationset_p.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void shareInterpolatorChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     bool m_shareInterpolator;
diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h
index 8789466..2a524b8 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanticipateinterpolator_p.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void tensionChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_tension;
diff --git a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
index e76f648..05a4092 100644
--- a/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
@@ -73,7 +73,7 @@ Q_SIGNALS:
     void extraTensionChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_tension;
diff --git a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
index ca54e07..4a9da71 100644
--- a/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidbounceinterpolator_p.h
@@ -65,7 +65,7 @@ public:
 Q_SIGNALS:
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
 };
diff --git a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h
index b7c2fb4..6fbeeeb 100644
--- a/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidcycleinterpolator_p.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void cyclesChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_cycles;
diff --git a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h
index 65093f5..3fa2800 100644
--- a/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroiddecelerateinterpolator_p.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void factorChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_factor;
diff --git a/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h
index 7a0d75c..cd27e0b 100644
--- a/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidinterpolator_p.h
@@ -60,7 +60,7 @@ public:
     explicit QQmlAndroidInterpolator(QObject *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
index b374a0f..4ccc2d3 100644
--- a/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidlinearinterpolator_p.h
@@ -65,7 +65,7 @@ public:
 Q_SIGNALS:
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
 };
diff --git a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h
index 5650098..b7eebb0 100644
--- a/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidovershootinterpolator_p.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void tensionChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_tension;
diff --git a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h
index 187b1cb..7e80fcf 100644
--- a/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidpathinterpolator_p.h
@@ -83,7 +83,7 @@ Q_SIGNALS:
     void controlY2Changed();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     QQmlAndroidOptional<qreal> m_controlX;
diff --git a/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h
index 10aeba3..7615a42 100644
--- a/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidrotateanimation_p.h
@@ -93,7 +93,7 @@ Q_SIGNALS:
     void pivotYTypeChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     qreal m_from;
diff --git a/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h
index 41c765c..7dd118d 100644
--- a/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidscaleanimation_p.h
@@ -102,7 +102,7 @@ Q_SIGNALS:
     void pivotYTypeChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     qreal m_fromX;
diff --git a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h
index d0f378f..6c3859b 100644
--- a/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h
+++ b/src/qmlandroid/view/animation/qqmlandroidtranslateanimation_p.h
@@ -102,7 +102,7 @@ Q_SIGNALS:
     void toYTypeChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
 
 private:
     qreal m_fromX;
diff --git a/src/qmlandroid/view/qqmlandroidlayoutparams_p.h b/src/qmlandroid/view/qqmlandroidlayoutparams_p.h
index 9f641e5..3c87699 100644
--- a/src/qmlandroid/view/qqmlandroidlayoutparams_p.h
+++ b/src/qmlandroid/view/qqmlandroidlayoutparams_p.h
@@ -88,10 +88,10 @@ Q_SIGNALS:
     void heightChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 
 private:
     bool m_dirty;
diff --git a/src/qmlandroid/view/qqmlandroidmenu_p.h b/src/qmlandroid/view/qqmlandroidmenu_p.h
index 690d54f..5e4a087 100644
--- a/src/qmlandroid/view/qqmlandroidmenu_p.h
+++ b/src/qmlandroid/view/qqmlandroidmenu_p.h
@@ -64,8 +64,8 @@ public:
     QList<QQmlAndroidMenuItem *> items() const;
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/qqmlandroidmenuitem_p.h b/src/qmlandroid/view/qqmlandroidmenuitem_p.h
index c169b34..b3c9be2 100644
--- a/src/qmlandroid/view/qqmlandroidmenuitem_p.h
+++ b/src/qmlandroid/view/qqmlandroidmenuitem_p.h
@@ -109,15 +109,15 @@ Q_SIGNALS:
     void actionViewChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject item);
     static bool onClick(JNIEnv *env, jobject object, jlong instance);
     static bool onMenuItemActionCollapse(JNIEnv *env, jobject object, jlong instance);
     static bool onMenuItemActionExpand(JNIEnv *env, jobject object, jlong instance);
 
-    void objectChange(ObjectChange change) Q_DECL_OVERRIDE;
+    void objectChange(ObjectChange change) override;
 
 private Q_SLOTS:
     void updateActionView();
diff --git a/src/qmlandroid/view/qqmlandroidview_p.h b/src/qmlandroid/view/qqmlandroidview_p.h
index 5dc1e00..5f4a3cb 100644
--- a/src/qmlandroid/view/qqmlandroidview_p.h
+++ b/src/qmlandroid/view/qqmlandroidview_p.h
@@ -283,8 +283,8 @@ protected:
     static QQmlAndroidView *children_at(QQmlListProperty<QQmlAndroidView> *list, int index);
     static void children_clear(QQmlListProperty<QQmlAndroidView> *list);
 
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onClick(JNIEnv *env, jobject object, jlong instance);
@@ -292,9 +292,9 @@ protected:
     static void onLayoutChange(JNIEnv *env, jobject object, jlong instance, jint left, jint top, jint right, jint bottom);
     static bool onLongClick(JNIEnv *env, jobject object, jlong instance);
 
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 
-    void objectChange(ObjectChange change) Q_DECL_OVERRIDE;
+    void objectChange(ObjectChange change) override;
 
 private Q_SLOTS:
     void updateBackground();
diff --git a/src/qmlandroid/view/qqmlandroidviewgroup_p.h b/src/qmlandroid/view/qqmlandroidviewgroup_p.h
index 6756309..8d72ea3 100644
--- a/src/qmlandroid/view/qqmlandroidviewgroup_p.h
+++ b/src/qmlandroid/view/qqmlandroidviewgroup_p.h
@@ -62,10 +62,10 @@ public:
     static QQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
-    void viewChange(ViewChange change, const ViewChangeData &data) Q_DECL_OVERRIDE;
+    void viewChange(ViewChange change, const ViewChangeData &data) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/qqmlandroidwindow_p.h b/src/qmlandroid/view/qqmlandroidwindow_p.h
index b999d3c..41a0fca 100644
--- a/src/qmlandroid/view/qqmlandroidwindow_p.h
+++ b/src/qmlandroid/view/qqmlandroidwindow_p.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void statusBarColorChanged();
 
 protected:
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidOptional<int> m_statusBarColor;
diff --git a/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h b/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h
index 35a6db6..f7bb356 100644
--- a/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidabsseekbar_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidAbsSeekBar(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidadapterview_p.h b/src/qmlandroid/widget/qqmlandroidadapterview_p.h
index 8000b6b..8418e30 100644
--- a/src/qmlandroid/widget/qqmlandroidadapterview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidadapterview_p.h
@@ -73,13 +73,13 @@ Q_SIGNALS:
     void click(int position);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onItemClick(JNIEnv *env, jobject object, jlong instance, jint position);
 
-    void objectChange(ObjectChange change) Q_DECL_OVERRIDE;
+    void objectChange(ObjectChange change) override;
 
 private Q_SLOTS:
     void updateAdapter();
diff --git a/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h b/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h
index 50ede9b..06110c3 100644
--- a/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h
+++ b/src/qmlandroid/widget/qqmlandroidarrayadapter_p.h
@@ -68,19 +68,19 @@ public:
     QStringList array() const;
     void setArray(const QStringList &array);
 
-    int count() const Q_DECL_OVERRIDE;
+    int count() const override;
     Q_INVOKABLE QString getItem(int position) const;
 
 public Q_SLOTS:
-    void clear() Q_DECL_OVERRIDE;
+    void clear() override;
 
 Q_SIGNALS:
     void styleChanged();
     void arrayChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     int m_style;
diff --git a/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h b/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h
index 84e6b00..a32cd61 100644
--- a/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h
+++ b/src/qmlandroid/widget/qqmlandroidbaseadapter_p.h
@@ -69,8 +69,8 @@ Q_SIGNALS:
     void countChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidbutton_p.h b/src/qmlandroid/widget/qqmlandroidbutton_p.h
index d990282..888dd0e 100644
--- a/src/qmlandroid/widget/qqmlandroidbutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidbutton_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidButton(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidcalendarview_p.h b/src/qmlandroid/widget/qqmlandroidcalendarview_p.h
index fbec814..cf39cc6 100644
--- a/src/qmlandroid/widget/qqmlandroidcalendarview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidcalendarview_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidCalendarView(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidcheckbox_p.h b/src/qmlandroid/widget/qqmlandroidcheckbox_p.h
index fd2e849..947487a 100644
--- a/src/qmlandroid/widget/qqmlandroidcheckbox_p.h
+++ b/src/qmlandroid/widget/qqmlandroidcheckbox_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidCheckBox(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h b/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h
index deec3c0..81f7830 100644
--- a/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidcompoundbutton_p.h
@@ -70,8 +70,8 @@ Q_SIGNALS:
     void checkedChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jboolean isChecked);
diff --git a/src/qmlandroid/widget/qqmlandroiddatepicker_p.h b/src/qmlandroid/widget/qqmlandroiddatepicker_p.h
index d697a09..56626a6 100644
--- a/src/qmlandroid/widget/qqmlandroiddatepicker_p.h
+++ b/src/qmlandroid/widget/qqmlandroiddatepicker_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidDatePicker(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidedittext_p.h b/src/qmlandroid/widget/qqmlandroidedittext_p.h
index f311d70..5263a90 100644
--- a/src/qmlandroid/widget/qqmlandroidedittext_p.h
+++ b/src/qmlandroid/widget/qqmlandroidedittext_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidEditText(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidframelayout_p.h b/src/qmlandroid/widget/qqmlandroidframelayout_p.h
index f6f8f60..f7debd5 100644
--- a/src/qmlandroid/widget/qqmlandroidframelayout_p.h
+++ b/src/qmlandroid/widget/qqmlandroidframelayout_p.h
@@ -63,8 +63,8 @@ public:
     static QQmlAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h
index d34d789..db3709a 100644
--- a/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidframelayoutparams_p.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void gravityChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidOptional<int> m_gravity;
diff --git a/src/qmlandroid/widget/qqmlandroidimageview_p.h b/src/qmlandroid/widget/qqmlandroidimageview_p.h
index 43c7d61..ab933d2 100644
--- a/src/qmlandroid/widget/qqmlandroidimageview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidimageview_p.h
@@ -79,8 +79,8 @@ Q_SIGNALS:
     void imageTintColorChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QAndroidJniObject getUri() const;
diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h b/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h
index 8a960cc..104af96 100644
--- a/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h
+++ b/src/qmlandroid/widget/qqmlandroidlinearlayout_p.h
@@ -100,8 +100,8 @@ Q_SIGNALS:
     void weightSumChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidOptional<bool> m_baselineAligned;
diff --git a/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h
index 884e058..a6084e8 100644
--- a/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidlinearlayoutparams_p.h
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void weightChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidOptional<int> m_gravity;
diff --git a/src/qmlandroid/widget/qqmlandroidlistview_p.h b/src/qmlandroid/widget/qqmlandroidlistview_p.h
index ee3f855..5262a24 100644
--- a/src/qmlandroid/widget/qqmlandroidlistview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidlistview_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidListView(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h
index 0baee68..f608bb7 100644
--- a/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidmarginlayoutparams_p.h
@@ -87,8 +87,8 @@ Q_SIGNALS:
     void bottomMarginChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidOptional<int> m_margin;
diff --git a/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h b/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h
index 2be93b8..1b21354 100644
--- a/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h
+++ b/src/qmlandroid/widget/qqmlandroidnumberpicker_p.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void valueChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onValueChange(JNIEnv *env, jobject object, jlong instance, jint value);
diff --git a/src/qmlandroid/widget/qqmlandroidprogressbar_p.h b/src/qmlandroid/widget/qqmlandroidprogressbar_p.h
index 8b85f53..ddd54b0 100644
--- a/src/qmlandroid/widget/qqmlandroidprogressbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidprogressbar_p.h
@@ -99,8 +99,8 @@ Q_SIGNALS:
     void maxChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private Q_SLOTS:
     bool updateProgress(int progress);
diff --git a/src/qmlandroid/widget/qqmlandroidradiobutton_p.h b/src/qmlandroid/widget/qqmlandroidradiobutton_p.h
index 2237478..977d45d 100644
--- a/src/qmlandroid/widget/qqmlandroidradiobutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidradiobutton_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidRadioButton(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidradiogroup_p.h b/src/qmlandroid/widget/qqmlandroidradiogroup_p.h
index 45cdecf..8b4cb7a 100644
--- a/src/qmlandroid/widget/qqmlandroidradiogroup_p.h
+++ b/src/qmlandroid/widget/qqmlandroidradiogroup_p.h
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void checkedButtonChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jint checkedId);
diff --git a/src/qmlandroid/widget/qqmlandroidratingbar_p.h b/src/qmlandroid/widget/qqmlandroidratingbar_p.h
index 215eeb9..64ec58b 100644
--- a/src/qmlandroid/widget/qqmlandroidratingbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidratingbar_p.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void ratingChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onRatingChanged(JNIEnv *env, jobject object, jlong instance, jfloat rating, jboolean fromUser);
diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h b/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h
index c142950..4a3ed3b 100644
--- a/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h
+++ b/src/qmlandroid/widget/qqmlandroidrelativelayout_p.h
@@ -88,8 +88,8 @@ public:
     };
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h b/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h
index 962111a..332eaf7 100644
--- a/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h
+++ b/src/qmlandroid/widget/qqmlandroidrelativelayoutparams_p.h
@@ -178,8 +178,8 @@ Q_SIGNALS:
     bool centerInParentChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidView *m_above;
diff --git a/src/qmlandroid/widget/qqmlandroidscrollview_p.h b/src/qmlandroid/widget/qqmlandroidscrollview_p.h
index 84b9a5a..a7037d1 100644
--- a/src/qmlandroid/widget/qqmlandroidscrollview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidscrollview_p.h
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void scrollYChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onScrollChanged(JNIEnv *env, jobject object, jlong instance, jint left, jint top);
diff --git a/src/qmlandroid/widget/qqmlandroidsearchview_p.h b/src/qmlandroid/widget/qqmlandroidsearchview_p.h
index bc99ea4..323a725 100644
--- a/src/qmlandroid/widget/qqmlandroidsearchview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidsearchview_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidSearchView(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidseekbar_p.h b/src/qmlandroid/widget/qqmlandroidseekbar_p.h
index 97e35ef..971985a 100644
--- a/src/qmlandroid/widget/qqmlandroidseekbar_p.h
+++ b/src/qmlandroid/widget/qqmlandroidseekbar_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidSeekBar(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onProgressChanged(JNIEnv *env, jobject object, jlong instance, jint progress, jboolean fromUser);
diff --git a/src/qmlandroid/widget/qqmlandroidspace_p.h b/src/qmlandroid/widget/qqmlandroidspace_p.h
index 6cee806..1429dc0 100644
--- a/src/qmlandroid/widget/qqmlandroidspace_p.h
+++ b/src/qmlandroid/widget/qqmlandroidspace_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidSpace(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidspinner_p.h b/src/qmlandroid/widget/qqmlandroidspinner_p.h
index 770701c..b20dd30 100644
--- a/src/qmlandroid/widget/qqmlandroidspinner_p.h
+++ b/src/qmlandroid/widget/qqmlandroidspinner_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidSpinner(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidswitch_p.h b/src/qmlandroid/widget/qqmlandroidswitch_p.h
index d28a3f2..988ae5d 100644
--- a/src/qmlandroid/widget/qqmlandroidswitch_p.h
+++ b/src/qmlandroid/widget/qqmlandroidswitch_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidSwitch(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidtabhost_p.h b/src/qmlandroid/widget/qqmlandroidtabhost_p.h
index 5d15520..b3cccea 100644
--- a/src/qmlandroid/widget/qqmlandroidtabhost_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtabhost_p.h
@@ -63,8 +63,8 @@ Q_SIGNALS:
     void tabChanged(const QString &tabId);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
     static void onRegisterNativeMethods(jobject listener);
     static void onTabChanged(JNIEnv *env, jobject object, jlong instance, jstring tabId);
diff --git a/src/qmlandroid/widget/qqmlandroidtabwidget_p.h b/src/qmlandroid/widget/qqmlandroidtabwidget_p.h
index f35debc..f072db2 100644
--- a/src/qmlandroid/widget/qqmlandroidtabwidget_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtabwidget_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidTabWidget(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidtextview_p.h b/src/qmlandroid/widget/qqmlandroidtextview_p.h
index 5e85e5f..b6c6c2e 100644
--- a/src/qmlandroid/widget/qqmlandroidtextview_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtextview_p.h
@@ -94,8 +94,8 @@ Q_SIGNALS:
     void inputTypeChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QString m_text;
diff --git a/src/qmlandroid/widget/qqmlandroidtimepicker_p.h b/src/qmlandroid/widget/qqmlandroidtimepicker_p.h
index e8ed115..adce9a3 100644
--- a/src/qmlandroid/widget/qqmlandroidtimepicker_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtimepicker_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidTimePicker(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h b/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h
index 4ce5a1d..9749692 100644
--- a/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h
+++ b/src/qmlandroid/widget/qqmlandroidtogglebutton_p.h
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void textOffChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QString m_textOn;
diff --git a/src/qmlandroid/widget/qqmlandroidviewanimator_p.h b/src/qmlandroid/widget/qqmlandroidviewanimator_p.h
index a037b50..21a8d05 100644
--- a/src/qmlandroid/widget/qqmlandroidviewanimator_p.h
+++ b/src/qmlandroid/widget/qqmlandroidviewanimator_p.h
@@ -81,8 +81,8 @@ Q_SIGNALS:
     void outAnimationChanged();
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 
 private:
     QQmlAndroidOptional<int> m_displayedChild;
diff --git a/src/qmlandroid/widget/qqmlandroidviewflipper_p.h b/src/qmlandroid/widget/qqmlandroidviewflipper_p.h
index d3682e9..c489973 100644
--- a/src/qmlandroid/widget/qqmlandroidviewflipper_p.h
+++ b/src/qmlandroid/widget/qqmlandroidviewflipper_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidViewFlipper(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h b/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h
index 975fef2..a7124c0 100644
--- a/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h
+++ b/src/qmlandroid/widget/qqmlandroidviewswitcher_p.h
@@ -60,8 +60,8 @@ public:
     explicit QQmlAndroidViewSwitcher(QQmlAndroidView *parent = nullptr);
 
 protected:
-    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
-    void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/anc/main.cpp b/tools/anc/main.cpp
index 2647b43..e1a1ca9 100644
--- a/tools/anc/main.cpp
+++ b/tools/anc/main.cpp
@@ -115,7 +115,7 @@ private:
         writePropertyNotifiers(out, properties);
         out << endl;
         out << "protected:" << endl;
-        out << "    QAndroidJniObject onCreate() Q_DECL_OVERRIDE;" << endl;
+        out << "    QAndroidJniObject onCreate() override;" << endl;
         out << endl;
         out << "private:" << endl;
         writePropertyMembers(out, properties);