diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-09 11:54:31 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-09 13:51:40 +0200 |
commit | 79f2d3c2e95a19c7302f2612f0fbf7176e4f25d1 (patch) | |
tree | 917026e48743d6a12dcd4c907afa7156390e91ab /src | |
parent | aba38703916f6e6a3808cd1531b4810c631f15a3 (diff) |
Removed a few warnings
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/items/qsgcanvas.cpp | 1 | ||||
-rw-r--r-- | src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp | 10 | ||||
-rw-r--r-- | src/declarative/scenegraph/util/qsgtexturematerial.h | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp index f2a5ccb4e7..7b7974804f 100644 --- 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 5801311be4..318fc4a009 100644 --- 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 db8e5aa43e..8a7c1a9583 100644 --- 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; }; |