1 files changed, 14 insertions, 7 deletions
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index e5abd6bc46..45dab3f2c1 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -325,8 +325,10 @@ public:
             return QVariant();
         }
 
-        if (role == Qt::DisplayRole || role == Qt::EditRole)
-            return QString("[%1,%2,%3]").arg(idx.row()).arg(idx.column()).arg(0);
+        if (role == Qt::DisplayRole || role == Qt::EditRole) {
+            return QLatin1Char('[') + QString::number(idx.row()) + QLatin1Char(',')
+                + QString::number(idx.column()) + QLatin1String(",0]");
+        }
 
         return QVariant();
     }
@@ -415,7 +417,8 @@ public:
 
     void reset()
     {
-        QAbstractTableModel::reset();
+        beginResetModel();
+        endResetModel();
     }
 
     int row_count;
@@ -3606,7 +3609,11 @@ public:
     {
         return QVariant();
     }
-    void res() { reset(); }
+    void res()
+    {
+        beginResetModel();
+        endResetModel();
+    }
 
     int rows;
     int columns;
@@ -3797,7 +3804,7 @@ public:
                           int role = Qt::DisplayRole) const
     {
         if (role == Qt::DisplayRole)
-            return QString("%1 - %2").arg(index.column()).arg(index.row());
+            return QString::number(index.column()) + QLatin1String(" - ") + QString::number(index.row());
         return QVariant();
     }
 
@@ -3919,12 +3926,12 @@ void tst_QTableView::task227953_setRootIndex()
 
     //setup the first table as a child of the first item
     for ( int row = 0; row < 40; ++row ) {
-        item1.appendRow(QList<QStandardItem*>() << new QStandardItem(QString("row %0").arg(row)));
+        item1.appendRow(QList<QStandardItem*>() << new QStandardItem(QLatin1String("row ") + QString::number(row)));
     }
 
     //setup the second table as a child of the second item
     for ( int row = 0; row < 10; ++row ) {
-        item2.appendRow(QList<QStandardItem*>() << new QStandardItem(QString("row %0").arg(row)));
+        item2.appendRow(QList<QStandardItem*>() << new QStandardItem(QLatin1String("row ") + QString::number(row)));
     }
 
     tableView.setModel(&model);