summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-11-29 14:23:34 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2017-01-03 14:11:16 +0000
commit6ff945052063710f2857be12631fa91759759786 (patch)
tree803799c041b9161b2398b1e7fc6b6aab62f6264f /src
parent6440075f6bfa44de3a84bd4e563aaa2eca69a627 (diff)
Android: Use override instead of Q_DECL_OVERRIDE
... for consistency. Change-Id: I37afaff6f7512a1cd09f0f31996b9bedc6cb3bab Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 4c375f75e0ed38d297dc44746e2e00f34f98269b)
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/android/qandroidplatformforeignwindow.h12
-rw-r--r--src/plugins/platforms/android/qandroidplatformopenglwindow.h2
-rw-r--r--src/plugins/platforms/android/qandroidplatformtheme.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformforeignwindow.h b/src/plugins/platforms/android/qandroidplatformforeignwindow.h
index be031f32e1..298f787607 100644
--- a/src/plugins/platforms/android/qandroidplatformforeignwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformforeignwindow.h
@@ -45,12 +45,12 @@ class QAndroidPlatformForeignWindow : public QAndroidPlatformWindow
public:
explicit QAndroidPlatformForeignWindow(QWindow *window);
~QAndroidPlatformForeignWindow();
- void lower() Q_DECL_OVERRIDE;
- void raise() Q_DECL_OVERRIDE;
- void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
- void setVisible(bool visible) Q_DECL_OVERRIDE;
- void applicationStateChanged(Qt::ApplicationState state) Q_DECL_OVERRIDE;
- void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
+ void lower() override;
+ void raise() override;
+ void setGeometry(const QRect &rect) override;
+ void setVisible(bool visible) override;
+ void applicationStateChanged(Qt::ApplicationState state) override;
+ void setParent(const QPlatformWindow *window) override;
private:
int m_surfaceId;
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.h b/src/plugins/platforms/android/qandroidplatformopenglwindow.h
index 9d21b962ee..a70f9f9eee 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.h
@@ -58,7 +58,7 @@ public:
void applicationStateChanged(Qt::ApplicationState) override;
- void repaint(const QRegion &region) Q_DECL_OVERRIDE;
+ void repaint(const QRegion &region) override;
protected:
void surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h) override;
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h
index 5ef531dd04..597caabb05 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.h
+++ b/src/plugins/platforms/android/qandroidplatformtheme.h
@@ -66,7 +66,7 @@ public:
const QPalette *palette(Palette type = SystemPalette) const override;
const QFont *font(Font type = SystemFont) const override;
QVariant themeHint(ThemeHint hint) const override;
- QString standardButtonText(int button) const Q_DECL_OVERRIDE;
+ QString standardButtonText(int button) const override;
bool usePlatformNativeDialog(DialogType type) const override;
QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;