Removed a few warnings

diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index f2a5ccb..7b79748 100644 (file)
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -729,6 +729,7 @@ void QSGCanvasPrivate::clearFocusInScope(QSGItem *scope, QSGItem *item, FocusOpt
 {
     Q_Q(QSGCanvas);
 
+    Q_UNUSED(item);
     Q_ASSERT(item);
     Q_ASSERT(scope);
 

diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
index 5801311..318fc4a 100644 (file)
--- a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
@@ -238,9 +238,11 @@ static void drawTriangle(float *bits, int width, int height, const DFVertex *v1,
         v1 = tmp;
     }
 
-    //   v1
-    //  /  \
-    // v3--v2
+    /*
+       v1
+      /  \
+     v3--v2
+     */
 
     int fromY = qMax(0, qCeil(v1->p.y));
     int midY = qMin(height, qCeil(qMin(v2->p.y, v3->p.y)));
@@ -678,7 +680,7 @@ void QSGDistanceFieldGlyphCache::populate(int count, const glyph_t *glyphs)
 {
     for (int i = 0; i < count; ++i) {
         glyph_t glyphIndex = glyphs[i];
-        if (glyphIndex >= glyphCount()) {
+        if ((int) glyphIndex >= glyphCount()) {
             qWarning("Warning: distance-field glyph is not available with index %d", glyphIndex);
             continue;
         }

diff --git a/src/declarative/scenegraph/util/qsgtexturematerial.h b/src/declarative/scenegraph/util/qsgtexturematerial.h
index db8e5aa..8a7c1a9 100644 (file)
--- a/src/declarative/scenegraph/util/qsgtexturematerial.h
+++ b/src/declarative/scenegraph/util/qsgtexturematerial.h
@@ -81,8 +81,8 @@ protected:
 
     uint m_filtering: 2;
     uint m_mipmap_filtering: 2;
-    uint m_vertical_wrap: 1;
     uint m_horizontal_wrap : 1;
+    uint m_vertical_wrap: 1;
 };