summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-03-22 15:18:12 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-24 07:28:10 +0000
commit9ddd0a6adfe6c4fa18b0cf242f4be664ef875a90 (patch)
tree6f206400d15ba93083f38fa70a017dfa76a548c2
parentcd1930c6ee0936b003c80cb0def967aa54af884b (diff)
QFilterKey creates creation changes
Change-Id: I4659f2f31b8e645dbf3d40208d6ca63081ffa4e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/materialsystem/qfilterkey.cpp10
-rw-r--r--src/render/materialsystem/qfilterkey.h1
-rw-r--r--src/render/materialsystem/qfilterkey_p.h6
3 files changed, 17 insertions, 0 deletions
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index 93f48b493..fb215e0b5 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -140,6 +140,16 @@ QString QFilterKey::name() const
return d->m_name;
}
+Qt3DCore::QNodeCreatedChangeBasePtr QFilterKey::createNodeCreationChange() const
+{
+ auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QFilterKeyData>::create(this);
+ auto &data = creationChange->data;
+ Q_D(const QFilterKey);
+ data.name = d->m_name;
+ data.value = d->m_value;
+ return creationChange;
+}
+
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h
index 44427ddf2..b8d30d65a 100644
--- a/src/render/materialsystem/qfilterkey.h
+++ b/src/render/materialsystem/qfilterkey.h
@@ -76,6 +76,7 @@ protected:
private:
Q_DECLARE_PRIVATE(QFilterKey)
QT3D_CLONEABLE(QFilterKey)
+ Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
};
} // namespace Qt3DRender
diff --git a/src/render/materialsystem/qfilterkey_p.h b/src/render/materialsystem/qfilterkey_p.h
index 87c22a056..3a9855f08 100644
--- a/src/render/materialsystem/qfilterkey_p.h
+++ b/src/render/materialsystem/qfilterkey_p.h
@@ -68,6 +68,12 @@ public:
QVariant m_value;
};
+struct QFilterKeyData
+{
+ QString name;
+ QVariant value;
+};
+
} // namespace Qt3DRender
QT_END_NAMESPACE