summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-20 20:57:27 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-09-25 10:42:42 +0000
commit43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch)
tree2b632ce1cba8aed2c99c5a88297da8120f5940bb /src/quick3d/quick3drender
parentc9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff)
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender')
-rw-r--r--src/quick3d/quick3drender/items/quick3dparameter_p_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdata.cpp2
-rw-r--r--src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
index 2e680b852..0590338cc 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
@@ -70,7 +70,7 @@ public:
Q_DECLARE_PUBLIC(Quick3DParameter)
- void setValue(const QVariant &value) Q_DECL_OVERRIDE;
+ void setValue(const QVariant &value) override;
};
} // namespace Quick
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index cd6e2a81e..539391da9 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -64,7 +64,7 @@ public:
{
}
- QVariant readProperty(const QVariant &v) Q_DECL_OVERRIDE
+ QVariant readProperty(const QVariant &v) override
{
// qjsValueTypeId are not compile time constant (no switch)
if (v.userType() == qjsValueTypeId) {
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
index dd3788878..121c64216 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
class QuickRenderNodeFactory : public Qt3DCore::QAbstractNodeFactory
{
public:
- Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+ Qt3DCore::QNode *createNode(const char *type) override;
void registerType(const char *className, const char *quickName, int major, int minor);