summaryrefslogtreecommitdiffstats
path: root/tests/auto/selftests/expected_skip.txt
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-06 18:00:42 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-06 18:00:42 (GMT)
commit34bfad76d1afe4a0ee27496e740c8566387dc16c (patch)
treec4304699a1a2d4a729bddfb3102a5ba3ad9a2cd8 /tests/auto/selftests/expected_skip.txt
parent16c3df54960b776f35f59288b888e829e7e81002 (diff)
parent608b66b5af75ae6982be428439eea735c00cc455 (diff)
downloadQt-34bfad76d1afe4a0ee27496e740c8566387dc16c.zip
Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.gz
Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team 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 1f5bf7b..5c9e497 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.1, Qt 4.7.1
+Config: Using QTest library 4.7.2, Qt 4.7.2
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)]