summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-03-28 16:44:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-31 09:16:43 +0200
commitf99dcdf07733b1cffeab89edb0fe0908cb753bd5 (patch)
tree51991bc8bbe6a2ded6cc42ef01667a1d4b4cef99
parent05b3fc4d583f886afe2f9e698a6224da46646e47 (diff)
downloadqtquickcontrols-f99dcdf07733b1cffeab89edb0fe0908cb753bd5.tar.gz
Disable mipmapping on the style item
The recent removal of QSGPlainTexture::setHasMipMaps() made the texture material enable mipmapping on the texture by default. Previously this was not the case, the material did not enable mipmapping on the texture regardless of the value of mipmapFiltering. The default value (Nearest) now properly enables mipmapping but this is not ideal for the style item. Therefore we disable mipmapping explicitly. Task-number: QTBUG-37690 Change-Id: I15607fd0c3a06f0cefc416b74f6cee25ef7966bd Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
-rw-r--r--src/controls/Private/qquickstyleitem.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index 49baa1fd..4a90e60b 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -104,6 +104,8 @@ public:
{
m_geometry.setDrawingMode(GL_TRIANGLE_STRIP);
setGeometry(&m_geometry);
+ // The texture material has mipmap filtering set to Nearest by default. This is not ideal.
+ m_material.setMipmapFiltering(QSGTexture::None);
setMaterial(&m_material);
}