equal
deleted
inserted
replaced
527 #else |
527 #else |
528 if (expectedFiles.at(ii).startsWith(input)) |
528 if (expectedFiles.at(ii).startsWith(input)) |
529 #endif |
529 #endif |
530 ++expected; |
530 ++expected; |
531 } |
531 } |
532 #if !defined(Q_OS_WIN) |
|
533 if (inputStartsWithRootPath) |
|
534 expected++; |
|
535 #endif |
|
536 } |
532 } |
537 |
533 |
538 QTest::qWait(1000); |
534 QTest::qWait(1000); |
539 if (cModel->rowCount() != expected) { |
535 if (cModel->rowCount() != expected) { |
540 for (int i = 0; i < cModel->rowCount(); ++i) { |
536 for (int i = 0; i < cModel->rowCount(); ++i) { |
546 |
542 |
547 |
543 |
548 // ### FIXME: This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel |
544 // ### FIXME: This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel |
549 // are fixed to properly capitalize paths, so that some folders are not duplicated in QFileSystemModel. |
545 // are fixed to properly capitalize paths, so that some folders are not duplicated in QFileSystemModel. |
550 #if defined(Q_OS_SYMBIAN) |
546 #if defined(Q_OS_SYMBIAN) |
551 QSKIP("This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel are fixed to properly capitalize paths") |
547 QSKIP("This will fail on Symbian on some tests and some environments until the file engine and QFileSystemModel are fixed to properly capitalize paths", SkipAll); |
552 #endif |
548 #endif |
553 QTRY_COMPARE(cModel->rowCount(), expected); |
549 QTRY_COMPARE(cModel->rowCount(), expected); |
554 } QT_CATCH(...) { |
550 } QT_CATCH(...) { |
555 qDeleteAll(files); |
551 qDeleteAll(files); |
556 QT_RETHROW; |
552 QT_RETHROW; |