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 10:00:08 +0200 |
| commit | 0ff2215bb0ea479a9de3e87d2cee27454c1bbda5 (patch) | |
| tree | 946178a0625dd940fcbf1d784f7fe731f91ac528 /src/render/materialsystem/qtechnique.cpp | |
| parent | 0ce9f6a41571a938dde47f7f068d7fce76288813 (diff) | |
| parent | 7339e9ae93df3720e1b936dd027d821105020bc4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
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 bbf29df22..a9b7ca82b 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(); |