diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
| commit | 15dc45ce109fe41699950a9b87282901b21f2d3d (patch) | |
| tree | 809e79e7b55988006bb3d990168b2bb7eda360b5 /src/quick/scenegraph/util/qsgsimplematerial.h | |
| parent | cf53bf9ae6716613c120cc4a0202c69bd59eba1e (diff) | |
| parent | a496e0874858a4b7d991c179c0e12df46c3d324c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
Diffstat (limited to 'src/quick/scenegraph/util/qsgsimplematerial.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index 0a733e346a..a1e5aa23be 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -140,8 +140,8 @@ class QSGSimpleMaterial : public QSGMaterial { public: #ifndef qdoc - QSGSimpleMaterial(const State &state, PtrShaderCreateFunc func) - : m_state(state) + QSGSimpleMaterial(const State &aState, PtrShaderCreateFunc func) + : m_state(aState) , m_func(func) { } |