diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-12-04 14:23:24 +0200 |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-12-04 14:23:24 +0200 |
| commit | 62fac968df5fb3632e458aeacfe5a8ef5cfd32bf (patch) | |
| tree | f72c174d68c1d722aa71cf57d3c757a7bed13a08 /tests/auto/qdesktopservices | |
| parent | 14c01d35cd132bb1a5e5725877d28d5f75c086ab (diff) | |
Switched S60 QDesktopServices implementation to CDocumentHandler based.
RApaLsSession based implementation did not succeed to start music
player in some S60 devices to playing mode. The only found solution to
this problem was to start using CDocumentHandler based implementation.
CDocumentHandler adds a new S60 dependency, but it is needed to make
QDesktopServices APIs fully fuonctional. However if Qt is comfigured
without S60 we still fallback to RApaLsSession implementation.
With CDocumentHandler the files are also opened as embedded, due to the
fact that swicthing files in stand-alone mode would require SwEvent
capability.
Task-number: QTBUG-4699
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'tests/auto/qdesktopservices')
| -rw-r--r-- | tests/auto/qdesktopservices/tst_qdesktopservices.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp index 2d9e5dcc94..c105a977a4 100644 --- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp @@ -70,6 +70,7 @@ private slots: void openMailtoUrl(); void openFileUrl_data(); void openFileUrl(); + void openMultipleFileUrls(); #endif void handlers(); void storageLocation_data(); @@ -197,6 +198,7 @@ void tst_qdesktopservices::openMailtoUrl() QFETCH(QUrl, url); QFETCH(bool, result); QCOMPARE(QDesktopServices::openUrl(url), result); + QTest::qWait(5000); } void tst_qdesktopservices::openFileUrl_data() @@ -239,7 +241,19 @@ void tst_qdesktopservices::openFileUrl() QFETCH(QUrl, url); QFETCH(bool, result); QCOMPARE(QDesktopServices::openUrl(url), result); - QTest::qWait(15000); + QTest::qWait(5000); +} + +void tst_qdesktopservices::openMultipleFileUrls() +{ +#ifndef RUN_MANUAL_TESTS + QSKIP("Test disabled -- only for manual purposes", SkipAll); +#endif + + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/images/image.bmp")), true); + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/images/image.png")), true); + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/others/noendofline.txt")), true); + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/installs/ErrRd.sisx")), true); } #endif |