summaryrefslogtreecommitdiffstats
path: root/tests/auto/selftests/expected_skip.txt
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-09-27 10:16:36 (GMT)
committeraavit <qt-info@nokia.com>2010-09-27 10:16:36 (GMT)
commit52e36c493d579323a09957028b0fd5ebc4d43021 (patch)
tree20e2be544f034222250fa19a4e27e2ee37b958aa /tests/auto/selftests/expected_skip.txt
parentc9a5ab5fd506663c5a7cd587d1b963c067d334bf (diff)
parentce2a273bab9b9094a1f0f3f60309797e11e59404 (diff)
downloadQt-52e36c493d579323a09957028b0fd5ebc4d43021.zip
Qt-52e36c493d579323a09957028b0fd5ebc4d43021.tar.gz
Qt-52e36c493d579323a09957028b0fd5ebc4d43021.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests/auto/selftests/expected_skip.txt')
-rw-r--r--tests/auto/selftests/expected_skip.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt
index e5bf1ff..1f5bf7b 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.7.0, Qt 4.7.0
+Config: Using QTest library 4.7.1, Qt 4.7.1
PASS : tst_Skip::initTestCase()
SKIP : tst_Skip::test() skipping all
Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]