diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
| commit | 05c543c75043824e12dac17a55e89bc11e74c7a4 (patch) | |
| tree | 4b9b117084b21dc9a8486befefd2f60c138c1ea4 /tests/auto/selftests/expected_skip.txt | |
| parent | 7bc18035816a2eac15dfac4d987eb9bf43f90ef6 (diff) | |
| parent | 6b79cbf5cadbaebef8be895a47ca314724afb1a1 (diff) | |
| download | Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.zip Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.gz Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tests/auto/selftests/expected_skip.txt')
| -rw-r--r-- | tests/auto/selftests/expected_skip.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt index e687759..c4ef92d 100644 --- a/tests/auto/selftests/expected_skip.txt +++ b/tests/auto/selftests/expected_skip.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Skip ********* -Config: Using QTest library 4.6.1, Qt 4.6.1 +Config: Using QTest library 4.6.2, Qt 4.6.2 PASS : tst_Skip::initTestCase() SKIP : tst_Skip::test() skipping all Loc: [/home/rmcgover/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)] |