summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qfilterkey.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-10-15 09:40:09 +0200
committerPaul Lemire <paul.lemire@kdab.com>2019-10-15 09:40:40 +0200
commit7339e9ae93df3720e1b936dd027d821105020bc4 (patch)
treef563b7cf4e02ad8a0628fb228733dc841f8ca554 /src/render/materialsystem/qfilterkey.cpp
parentfd85ebb1e24d48ffdff0659810a1830691bba89f (diff)
parent7628760f8f16aba7769c04f2251633faa9fbcad1 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Diffstat (limited to 'src/render/materialsystem/qfilterkey.cpp')
-rw-r--r--src/render/materialsystem/qfilterkey.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index dc968400b..2105da987 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -60,6 +60,8 @@ QFilterKeyPrivate::QFilterKeyPrivate()
Filter keys are used by QTechnique and QRenderPass to specify at which stage of rendering the
technique or the render pass is used.
+
+ \note QFilterKey node can not be disabled.
*/
/*!
@@ -73,6 +75,8 @@ QFilterKeyPrivate::QFilterKeyPrivate()
A FilterKey is a storage type for filter key and value pair.
Filter keys are used by Technique and RenderPass to specify at which stage of rendering the
technique or the render pass is used.
+
+ \note FilterKey node can not be disabled.
*/
QFilterKey::QFilterKey(QNode *parent)