diff options
Diffstat (limited to 'examples/quick')
5 files changed, 16 insertions, 16 deletions
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h index 85720f1c59..7240c0bf54 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h +++ b/examples/quick/quickwidgets/qquickviewcomparison/fbitem.h @@ -54,9 +54,9 @@ class FbItemRenderer : public QQuickFramebufferObject::Renderer { public: FbItemRenderer(bool multisample); - void synchronize(QQuickFramebufferObject *item) Q_DECL_OVERRIDE; - void render() Q_DECL_OVERRIDE; - QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) Q_DECL_OVERRIDE; + void synchronize(QQuickFramebufferObject *item) override; + void render() override; + QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override; private: void ensureInit(); @@ -105,7 +105,7 @@ class FbItem : public QQuickFramebufferObject public: explicit FbItem(QQuickItem *parent = 0); - QQuickFramebufferObject::Renderer *createRenderer() const Q_DECL_OVERRIDE; + QQuickFramebufferObject::Renderer *createRenderer() const override; QVector3D eye() const { return m_eye; } void setEye(const QVector3D &v); diff --git a/examples/quick/rendercontrol/window_multithreaded.cpp b/examples/quick/rendercontrol/window_multithreaded.cpp index 013ee7c208..7a0bd07246 100644 --- a/examples/quick/rendercontrol/window_multithreaded.cpp +++ b/examples/quick/rendercontrol/window_multithreaded.cpp @@ -217,7 +217,7 @@ class RenderControl : public QQuickRenderControl { public: RenderControl(QWindow *w) : m_window(w) { } - QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE; + QWindow *renderWindow(QPoint *offset) override; private: QWindow *m_window; diff --git a/examples/quick/rendercontrol/window_multithreaded.h b/examples/quick/rendercontrol/window_multithreaded.h index e8658c4a61..b7d7408479 100644 --- a/examples/quick/rendercontrol/window_multithreaded.h +++ b/examples/quick/rendercontrol/window_multithreaded.h @@ -82,7 +82,7 @@ public: void aboutToQuit(); private: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; void init(); void cleanup(); void ensureFbo(); @@ -110,11 +110,11 @@ public: ~WindowMultiThreaded(); protected: - void exposeEvent(QExposeEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void exposeEvent(QExposeEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + bool event(QEvent *e) override; private slots: void run(); diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp index bd4de9a7cb..f1512d6e3e 100644 --- a/examples/quick/rendercontrol/window_singlethreaded.cpp +++ b/examples/quick/rendercontrol/window_singlethreaded.cpp @@ -60,7 +60,7 @@ class RenderControl : public QQuickRenderControl { public: RenderControl(QWindow *w) : m_window(w) { } - QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE; + QWindow *renderWindow(QPoint *offset) override; private: QWindow *m_window; diff --git a/examples/quick/rendercontrol/window_singlethreaded.h b/examples/quick/rendercontrol/window_singlethreaded.h index 4736f036ad..7174311a69 100644 --- a/examples/quick/rendercontrol/window_singlethreaded.h +++ b/examples/quick/rendercontrol/window_singlethreaded.h @@ -65,10 +65,10 @@ public: ~WindowSingleThreaded(); protected: - void exposeEvent(QExposeEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void exposeEvent(QExposeEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; private slots: void run(); |