diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-10-15 09:40:09 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2019-10-15 09:40:40 +0200 |
commit | 7339e9ae93df3720e1b936dd027d821105020bc4 (patch) | |
tree | f563b7cf4e02ad8a0628fb228733dc841f8ca554 /src/render/materialsystem/qtechnique.cpp | |
parent | fd85ebb1e24d48ffdff0659810a1830691bba89f (diff) | |
parent | 7628760f8f16aba7769c04f2251633faa9fbcad1 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
Diffstat (limited to 'src/render/materialsystem/qtechnique.cpp')
-rw-r--r-- | src/render/materialsystem/qtechnique.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 2b96aa285..5ebaefce7 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -87,6 +87,8 @@ QTechniquePrivate::~QTechniquePrivate() QSurfaceFormat::setDefaultFormat(). Setting the QSurfaceFormat on the view will likely have no effect on Qt3D related rendering. + \note Technique node can not be disabled. + \qml Technique { id: gl3Technique @@ -152,6 +154,8 @@ QTechniquePrivate::~QTechniquePrivate() QSurfaceFormat::setDefaultFormat(). Setting the QSurfaceFormat on the view will likely have no effect on Qt3D related rendering. + \note QTechnique node can not be disabled. + \code QTechnique *gl3Technique = new QTechnique(); |