aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-12-08 10:22:47 +0100
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2014-12-09 09:49:59 +0100
commitff3962001b20fdc6e9946fbf05d39a456561a9ed (patch)
tree5c2cb9dd5d05c24b47573897e41b0178e7864cce
parent7568922fa240e6e9440e9c6e93bf8ec00c06ec17 (diff)
Quick: fix test
/Users/erik/dev/qt5-stable/qtdeclarative/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp:1561:60: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] items << qMakePair(QString("new item " + j), QString::number(j)); ~~~~~~~~~~~~^~~ Change-Id: I94bd952abf82a8f174772482330b5fdd636578ad Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--tests/auto/quick/qquickgridview/tst_qquickgridview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 123d7f5032..efd9ab12fe 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -1558,7 +1558,7 @@ void tst_QQuickGridView::multipleChanges(bool condensed)
{
QList<QPair<QString, QString> > items;
for (int j=changes[i].index; j<changes[i].index + changes[i].count; ++j)
- items << qMakePair(QString("new item " + j), QString::number(j));
+ items << qMakePair(QString("new item %1").arg(j), QString::number(j));
model.insertItems(changes[i].index, items);
break;
}