diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-06-04 16:56:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 11:40:25 +0200 |
| commit | 1535da8a5923b5829b945cc9fd1dee4cdfbcfe5e (patch) | |
| tree | e0d7ecfae3b56f1d995a4c1c39bb46bc03d5b529 /src/quick/scenegraph/util/qsgsimplematerial.h | |
| parent | 7775287e40689c6301ddb838b4bcd030b617677c (diff) | |
Improve on scenegraph documentation.
Change-Id: Ib584a45454f6fd2a3c0bfb32a76b19839e4a2a09
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgsimplematerial.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index 5e58bd56ca..1dbb7eeffe 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -140,8 +140,8 @@ typedef QSGMaterialShader *(*PtrShaderCreateFunc)(); template <typename State> class QSGSimpleMaterial : public QSGMaterial { - public: +#ifndef qdoc QSGSimpleMaterial(const State &state, PtrShaderCreateFunc func) : m_state(state) , m_func(func) @@ -158,6 +158,7 @@ public: State *state() { return &m_state; } const State *state() const { return &m_state; } +#endif private: static QSGMaterialType m_type; |