diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-10 12:34:54 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-10 12:34:54 (GMT) |
| commit | d8a284783b56e2ddbcedff3fc9577ec6038aab57 (patch) | |
| tree | 1d49be6cb7de25836957adf30ac113c3a0499911 /tests/auto/qsidebar/tst_qsidebar.cpp | |
| parent | 4a6548b83a6f1df42b82664efaca26c7efbc1909 (diff) | |
| parent | c0bbe44ab6290dee088138c01724779026d2c033 (diff) | |
| download | Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.zip Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.tar.gz Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/corelib/animation/qanimationgroup.cpp
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'tests/auto/qsidebar/tst_qsidebar.cpp')
| -rw-r--r-- | tests/auto/qsidebar/tst_qsidebar.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/qsidebar/tst_qsidebar.cpp index 705e222..1384391 100644 --- a/tests/auto/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/qsidebar/tst_qsidebar.cpp @@ -185,6 +185,13 @@ void tst_QSidebar::addUrls() qsidebar.addUrls(doubleUrls, 1); QCOMPARE(qsidebar.urls().size(), 1); + // Two paths that are effectively pointing to the same location + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath()); + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath() + "/."); + qsidebar.setUrls(emptyUrls); + qsidebar.addUrls(doubleUrls, 1); + QCOMPARE(qsidebar.urls().size(), 1); + #if defined(Q_OS_WIN) //Windows is case insensitive so no duplicate entries in that case doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath()); @@ -200,8 +207,6 @@ void tst_QSidebar::addUrls() qsidebar.addUrls(doubleUrls, 1); QCOMPARE(qsidebar.urls().size(), 2); #endif - - } void tst_QSidebar::goToUrl() |