diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-15 15:47:32 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-15 15:47:32 +0200 |
commit | d1bb9e36d0c3497b790fdf1887dcef0567aaad46 (patch) | |
tree | 315822554f8df462cc47bb2a3a386844799ae327 | |
parent | ca31cbf2ad5dc43d74a2220d929f45bfe10c806b (diff) | |
parent | b0183beea565baca7f32f4f2f4aa579ae6901577 (diff) |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
-rw-r--r-- | src/declarative/items/qsgshadereffectmesh.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/items/qsgshadereffectmesh.cpp b/src/declarative/items/qsgshadereffectmesh.cpp index f4d8b468af..05131285df 100644 --- a/src/declarative/items/qsgshadereffectmesh.cpp +++ b/src/declarative/items/qsgshadereffectmesh.cpp @@ -198,7 +198,6 @@ void QSGGridMesh::setResolution(const QSize &res) if (res == m_resolution) return; if (res.width() < 1 || res.height() < 1) { - qWarning("QSGGridMesh: Resolution must be at least 1x1"); return; } m_resolution = res; |