diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-05 15:37:26 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-05 15:37:26 (GMT) |
| commit | a4fc85c75f068b73f9c2334c77b0ae2275510e17 (patch) | |
| tree | 7b4143f5b009bb0acca3549f614834a7ae9284c3 /tests | |
| parent | eaaf45c7b8b8d810bbd77e73b72771543dd31b1a (diff) | |
| parent | b53192d51cf8064dcb4361b3032d1e39260f4eea (diff) | |
| download | Qt-a4fc85c75f068b73f9c2334c77b0ae2275510e17.zip Qt-a4fc85c75f068b73f9c2334c77b0ae2275510e17.tar.gz Qt-a4fc85c75f068b73f9c2334c77b0ae2275510e17.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-origin
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdesktopservices/tst_qdesktopservices.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp index 5e3ae4a..dd85774 100644 --- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp @@ -307,7 +307,7 @@ void tst_qdesktopservices::storageLocation() switch(location) { case QDesktopServices::DesktopLocation: - QCOMPARE( storageLocation, QString() ); + QCOMPARE( storageLocation, drive + QString("/data") ); break; case QDesktopServices::DocumentsLocation: QCOMPARE( storageLocation, drive + QString("/data") ); |