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

diff --git a/src/declarative/items/qsgshadereffectmesh.cpp b/src/declarative/items/qsgshadereffectmesh.cpp
index f4d8b46..0513128 100644 (file)
--- 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;