diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:25:48 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-23 16:20:03 +0000 |
commit | f72d63866d3f5820865fcd309b649dc9932518ee (patch) | |
tree | 675610cbbc8a88f0197c351e754e7892e4eb7871 /src/plugins/platforms/qwayland-xcomposite-egl | |
parent | 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff) | |
download | qtwayland-f72d63866d3f5820865fcd309b649dc9932518ee.tar.gz |
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/plugins/platforms/qwayland-xcomposite-egl')
-rw-r--r-- | src/plugins/platforms/qwayland-xcomposite-egl/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp index 321182ad..996f6084 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp @@ -49,7 +49,7 @@ class QWaylandXCompositeEglPlatformIntegrationPlugin : public QPlatformIntegrati Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-egl.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QWaylandXCompositeEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h index 5d766543..009a12f6 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h @@ -58,7 +58,7 @@ public: m_client_buffer_integration->initialize(display()); } - QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE + QWaylandClientBufferIntegration *clientBufferIntegration() const override { return m_client_buffer_integration; } private: |