diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 14:03:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 14:03:21 +0200 |
| commit | 1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch) | |
| tree | 0b61c2d801525228f4c5795795d1cdeb57b3edfa /tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp | |
| parent | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff) | |
| parent | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp')
| -rw-r--r-- | tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp index 8b4e209b1b..56dcdd5698 100644 --- a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp @@ -82,6 +82,7 @@ void tst_qdesktopservices::openUrl() QCOMPARE(QDesktopServices::openUrl(QUrl()), false); #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) // this test is only valid on windows on other systems it might mean open a new document in the application handling .file + QTest::ignoreMessage(QtWarningMsg, "ShellExecute 'file://invalid.file' failed (error 3)."); QCOMPARE(QDesktopServices::openUrl(QUrl("file://invalid.file")), false); #endif } |