diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-10 16:57:11 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 16:57:11 +0000 |
| commit | 0866680bd904aff4fe2a643a2b81c460cbb99c77 (patch) | |
| tree | 242dae052199994a35f5e68578661175241a0a71 /tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | |
| parent | 34ea269b3b173498312b0203d6875ef3b4ba0253 (diff) | |
| parent | fc35f714340d5361231506dfbead132122f59460 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp')
| -rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index 1d6e75e76e..f8f3900372 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -601,6 +601,9 @@ void tst_QCompleter::directoryModel_data() QTest::newRow("()") << "" << "" << "/" << "/"; QTest::newRow("(/a)") << "/a" << "" << "Applications" << "/Applications"; QTest::newRow("(/u)") << "/u" << "" << "Users" << "/Users"; +#elif defined(Q_OS_ANDROID) + QTest::newRow("()") << "" << "" << "/" << "/"; + QTest::newRow("(/et)") << "/et" << "" << "etc" << "/etc"; #else QTest::newRow("()") << "" << "" << "/" << "/"; #if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) @@ -647,6 +650,9 @@ void tst_QCompleter::fileSystemModel_data() QTest::newRow("()") << "" << "" << "/" << "/"; QTest::newRow("(/a)") << "/a" << "" << "Applications" << "/Applications"; // QTest::newRow("(/d)") << "/d" << "" << "Developer" << "/Developer"; +#elif defined(Q_OS_ANDROID) + QTest::newRow("()") << "" << "" << "/" << "/"; + QTest::newRow("(/et)") << "/et" << "" << "etc" << "/etc"; #else QTest::newRow("()") << "" << "" << "/" << "/"; #if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX) |