Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

1 files changed, 2 insertions, 6 deletions

diff --git a/src/declarative/items/qsgshadereffectsource_p.h b/src/declarative/items/qsgshadereffectsource_p.h
index 1b6e1b5fe8..5d571ed42d 100644
--- a/src/declarative/items/qsgshadereffectsource_p.h
+++ b/src/declarative/items/qsgshadereffectsource_p.h
@@ -82,7 +82,7 @@ public:
     QSize size() const { return m_size; }
     void setSize(const QSize &size);
 
-    void setHasMipmaps(QSGTexture::Filtering filtering);
+    void setHasMipmaps(bool mipmap);
 
     void bind();
 
@@ -120,11 +120,7 @@ private:
     QSGRectangleNode *m_debugOverlay;
 #endif
 
-    uint m_hWrapMode : 1;
-    uint m_vWrapMode : 1;
-    uint m_filtering : 2;
-    uint m_mipmapFiltering : 2;
-
+    uint m_mipmap : 1;
     uint m_live : 1;
     uint m_dirtyTexture : 1;
     uint m_multisamplingSupportChecked : 1;