From aabbd27dda898cfb87998b81c28512c2f8907847 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 10 Sep 2013 23:04:07 +0200 Subject: Simplify QFileSystemModel::remove by using QDir::removeRecursively This also fixes it in case of hidden or system files, which were missing from the filter (found by Denis Kovalskiy). Change-Id: Ic12de12ec51c20de52d040514e90be5e783add43 Reviewed-by: Thiago Macieira --- .../auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp') diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 0fe7c8ab75..0b9fb5c168 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -921,10 +921,8 @@ void tst_QFileSystemModel::mkdir() int oldRow = idx.row(); QTest::qWait(WAITTIME); idx = model->index(newFolderPath); - QDir cleanup(tmp); - QVERIFY(cleanup.rmdir(QLatin1String("NewFoldermkdirtest3"))); - QVERIFY(cleanup.rmdir(QLatin1String("NewFoldermkdirtest5"))); - bestatic.rmdir(newFolderPath); + QVERIFY(model->remove(idx)); + QVERIFY(!bestatic.exists()); QVERIFY(0 != idx.row()); QCOMPARE(oldRow, idx.row()); } -- cgit v1.2.3