Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41

2 files changed, 4 insertions, 4 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)
     {
     }
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h
index cbc4f7d51f..83d941b084 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial.h
@@ -59,10 +59,10 @@ public:
     void setTexture(QSGTexture *texture);
     QSGTexture *texture() const { return m_texture; }
 
-    void setMipmapFiltering(QSGTexture::Filtering filtering) { m_mipmap_filtering = filtering; }
+    void setMipmapFiltering(QSGTexture::Filtering filteringType) { m_mipmap_filtering = filteringType; }
     QSGTexture::Filtering mipmapFiltering() const { return (QSGTexture::Filtering) m_mipmap_filtering; }
 
-    void setFiltering(QSGTexture::Filtering filtering) { m_filtering = filtering; }
+    void setFiltering(QSGTexture::Filtering filteringType) { m_filtering = filteringType; }
     QSGTexture::Filtering filtering() const { return (QSGTexture::Filtering)  m_filtering; }
 
     void setHorizontalWrapMode(QSGTexture::WrapMode mode) { m_horizontal_wrap = mode; }