aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-06-16 14:08:29 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-06-16 14:08:29 +1000
commit7126b27f5dfeba005cc7f17610bcc09cf0003b52 (patch)
tree274a976b05f14463bb6b073cfe3e2d422f4665a9
parent4c6e4cbe7d8a4d3e7d4cab8fb9787f4c781bed50 (diff)
parentb0183beea565baca7f32f4f2f4aa579ae6901577 (diff)
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
-rw-r--r--src/declarative/items/qsgshadereffectmesh.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/items/qsgshadereffectmesh.cpp b/src/declarative/items/qsgshadereffectmesh.cpp
index 4900755e46..dbc3472d09 100644
--- a/src/declarative/items/qsgshadereffectmesh.cpp
+++ b/src/declarative/items/qsgshadereffectmesh.cpp
@@ -203,7 +203,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;