diff options
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index 63a254c26a..1ea2ab7bd2 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -605,8 +605,8 @@ static bool compareStates(const QSignalSpy& spy, const StateList &expectedStates } qDebug("\n" - "expected (count == %d): %s\n" - "actual (count == %d): %s\n", expectedStates.count(), qPrintable(e), spy.count(), qPrintable(a)); + "expected (count == %zd): %s\n" + "actual (count == %zd): %s\n", size_t(expectedStates.count()), qPrintable(e), size_t(spy.count()), qPrintable(a)); } return equals; } diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp index 8679fb7702..011a44d405 100644 --- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp +++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp @@ -229,7 +229,7 @@ void tst_QCborValue::basics_data() if (t == QCborValue::Double) return QTest::addRow("Double:%g", exp.toDouble()); if (t == QCborValue::ByteArray || t == QCborValue::String) - return QTest::addRow("%s:%d", typeString, exp.toString().size()); + return QTest::addRow("%s:%zd", typeString, size_t(exp.toString().size())); return QTest::newRow(typeString); }; addRow() << t << v << exp; diff --git a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp index eeeec9b67f..10080a66ed 100644 --- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp +++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp @@ -80,7 +80,7 @@ void tst_QCborValue_Json::toVariant_data() if (v.type() == QCborValue::Double) return QTest::addRow("Double:%g", exp.toDouble()); if (v.type() == QCborValue::ByteArray || v.type() == QCborValue::String) - return QTest::addRow("%s:%d", typeString, exp.toString().size()); + return QTest::addRow("%s:%zd", typeString, size_t(exp.toString().size())); if (v.type() >= 0x10000) return QTest::newRow(exp.typeName()); return QTest::newRow(typeString); diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp index f2839d57e1..9fdfe285dc 100644 --- a/tests/auto/other/lancelot/paintcommands.cpp +++ b/tests/auto/other/lancelot/paintcommands.cpp @@ -1158,7 +1158,7 @@ void PaintCommands::command_drawPolygon(QRegularExpressionMatch re) array.append(QPointF(convertToDouble(numbers.at(i)), convertToDouble(numbers.at(i+1)))); if (m_verboseMode) - printf(" -(lance) drawPolygon(size=%d)\n", array.size()); + printf(" -(lance) drawPolygon(size=%zd)\n", size_t(array.size())); m_painter->drawPolygon(array, caps.at(2).toLower() == "winding" ? Qt::WindingFill : Qt::OddEvenFill); } @@ -1174,7 +1174,7 @@ void PaintCommands::command_drawPolyline(QRegularExpressionMatch re) array.append(QPointF(numbers.at(i).toFloat(),numbers.at(i+1).toFloat())); if (m_verboseMode) - printf(" -(lance) drawPolyline(size=%d)\n", array.size()); + printf(" -(lance) drawPolyline(size=%zd)\n", size_t(array.size())); m_painter->drawPolyline(array.toPolygon()); } @@ -1499,7 +1499,7 @@ void PaintCommands::command_path_addPolygon(QRegularExpressionMatch re) array.append(QPointF(numbers.at(i).toFloat(),numbers.at(i+1).toFloat())); if (m_verboseMode) - printf(" -(lance) path_addPolygon(name=%s, size=%d)\n", qPrintable(name), array.size()); + printf(" -(lance) path_addPolygon(name=%s, size=%zd)\n", qPrintable(name), size_t(array.size())); m_pathMap[name].addPolygon(array); } @@ -2738,7 +2738,7 @@ void PaintCommands::command_pen_setDashPattern(QRegularExpressionMatch re) pattern.append(convertToDouble(numbers.at(i))); if (m_verboseMode) - printf(" -(lance) pen_setDashPattern(size=%d)\n", pattern.size()); + printf(" -(lance) pen_setDashPattern(size=%zd)\n", size_t(pattern.size())); QPen p = m_painter->pen(); p.setDashPattern(pattern); @@ -2774,7 +2774,7 @@ void PaintCommands::command_drawConvexPolygon(QRegularExpressionMatch re) array.append(QPointF(convertToDouble(numbers.at(i)), convertToDouble(numbers.at(i+1)))); if (m_verboseMode) - printf(" -(lance) drawConvexPolygon(size=%d)\n", array.size()); + printf(" -(lance) drawConvexPolygon(size=%zd)\n", size_t(array.size())); m_painter->drawConvexPolygon(array); diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index d11d28206b..32cdd7ba73 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -292,7 +292,7 @@ void tst_QAccessibility::cleanup() { const EventList list = QTestAccessibility::events(); if (!list.isEmpty()) { - qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(), + qWarning("%zd accessibility event(s) were not handled in testfunction '%s':", size_t(list.count()), QString(QTest::currentTestFunction()).toLatin1().constData()); for (int i = 0; i < list.count(); ++i) qWarning(" %d: Object: %p Event: '%s' Child: %d", i + 1, list.at(i)->object(), |