summaryrefslogtreecommitdiffstats
path: root/tests/auto/selftests/expected_crashes_3.txt
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-11 06:32:04 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-11 06:32:04 (GMT)
commit8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e (patch)
treeb8b69f812095df8bf780f88302c7784c4d2e18e0 /tests/auto/selftests/expected_crashes_3.txt
parent34450eb48e56677395601bf155a6a05752b326ad (diff)
parentdbfe5f81e300de3a43311197826f23ff031b4b23 (diff)
downloadQt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.zip
Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.tar.gz
Qt-8e72075b8333dcefaa7ddbaeb0bc7ae45d42ff1e.tar.bz2
Merge remote branch 'origin/master' into bearermanagement/integration
Conflicts: configure
Diffstat (limited to 'tests/auto/selftests/expected_crashes_3.txt')
-rw-r--r--tests/auto/selftests/expected_crashes_3.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt
index aabe83d..3aced25 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/selftests/expected_crashes_3.txt
@@ -1,5 +1,5 @@
********* Start testing of tst_Crashes *********
-Config: Using QTest library 4.6.2, Qt 4.6.2
+Config: Using QTest library 4.7.0, Qt 4.7.0
PASS : tst_Crashes::initTestCase()
QFATAL : tst_Crashes::crash() Received signal 11
FAIL! : tst_Crashes::crash() Received a fatal error.