From a6903f3da80418aca511e230d9c5f2f9e423be7d Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 5 Nov 2020 12:08:10 +0100 Subject: [PATCH] Fix a mistake when using QLatin1String::arg QLatin1String::arg (and QStringView::arg) only support string-like arguments, and QLatin1String("%1").arg(123) does *not* produce the string "123" -- 123 gets routed through the QChar(int) constructor instead. Fix by using QString. Change-Id: I96371a15e1af957ef8133e30e79eb3e22b3e9d32 Reviewed-by: Edward Welbourne Reviewed-by: Volker Hilsheimer Reviewed-by: Thiago Macieira --- .../itemviews/qabstractitemview/tst_qabstractitemview.cpp | 4 ++-- tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 5f98902abdf..cc701eebe3e 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -1110,8 +1110,8 @@ void tst_QAbstractItemView::checkIntersectedRect_data() { QStandardItemModel *model = new QStandardItemModel; for (int i = 0; i < rowCount; ++i) { - const QList sil({new QStandardItem(QLatin1String("Row %1 Item").arg(i)), - new QStandardItem(QLatin1String("2nd column"))}); + const QList sil({new QStandardItem(QString("Row %1 Item").arg(i)), + new QStandardItem(QString("2nd column"))}); model->appendRow(sil); } return model; diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index d1adc7a29fc..9a2b5afa6a2 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -4860,13 +4860,13 @@ void tst_QTreeView::checkIntersectedRect_data() { QStandardItemModel *model = new QStandardItemModel; for (int i = 0; i < rowCount; ++i) { - const QList sil({new QStandardItem(QLatin1String("Row %1 Item").arg(i)), - new QStandardItem(QLatin1String("2nd column"))}); + const QList sil({new QStandardItem(QString("Row %1 Item").arg(i)), + new QStandardItem(QString("2nd column"))}); model->appendRow(sil); } for (int i = 2; i < 4; ++i) { - const QList sil({new QStandardItem(QLatin1String("Row %1 Item").arg(i)), - new QStandardItem(QLatin1String("2nd column"))}); + const QList sil({new QStandardItem(QString("Row %1 Item").arg(i)), + new QStandardItem(QString("2nd column"))}); model->item(i)->appendRow(sil); } return model;