Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging:
  Fix compile warning in tests.

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index 9fbf2a0..2f70d3d 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -426,7 +426,7 @@ static bool diffIsSmallEnough(double diff, double norm)
     return diff <= 1e-12 * norm;
 }
 
-static bool diffIsSmallEnough(float diff, float norm)
+static inline bool diffIsSmallEnough(float diff, float norm)
 {
     return diff <= 1e-5 * norm;
 }
@@ -625,7 +625,7 @@ void tst_QSvgRenderer::gradientRefs()
             "</defs>"
         "</svg>"
     };
-    for (int i = 0 ; i < sizeof(svgs) / sizeof(svgs[0]) ; ++i)
+    for (size_t i = 0 ; i < sizeof(svgs) / sizeof(svgs[0]) ; ++i)
     {
         QByteArray data = svgs[i];
         QSvgRenderer renderer(data);