diff options
Diffstat (limited to 'tests/benchmarks/gui/painting')
-rw-r--r-- | tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp | 4 | ||||
-rw-r--r-- | tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp index 4b2781e9ea..a6f144ea8a 100644 --- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp @@ -1290,7 +1290,7 @@ void tst_QPainter::drawScaledAntialiasedRoundedRect_data() { QTest::addColumn<float>("scale"); - for (float i = 0; i < 3; i += .1) + for (float i = 0; i < 3; i += .1f) QTest::newRow(QString(QLatin1String("scale=%1")).arg(i).toLatin1()) << i; } @@ -1471,7 +1471,7 @@ void tst_QPainter::drawScaledBorderPixmapRoundedRect_data() QTest::addColumn<float>("scale"); QTest::addColumn<int>("imageType"); - for (float i = 0; i < 3; i += .1) + for (float i = 0; i < 3; i += .1f) QTest::newRow(QString(QLatin1String("scale=%1; imagetype=ARGB32_Pre")).arg(i).toLatin1()) << i << (int)QImage::Format_ARGB32_Premultiplied; //for (float i = 0; i < 3; i += .1) // QTest::newRow(QString(QLatin1String("scale=%1; imagetype=ARGB8565_Pre")).arg(i).toLatin1()) << i << (int)QImage::Format_ARGB8565_Premultiplied; diff --git a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp index 823eb404e2..e17f8c6436 100644 --- a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp +++ b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp @@ -152,7 +152,7 @@ private slots: QString makeString(int length) { const char chars[] = "abcd efgh ijkl mnop qrst uvwx yz!$. ABCD 1234"; - int len = strlen(chars); + const int len = int(strlen(chars)); QString ret; for (int j = 0; j < length; j++) { |