diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-11-30 14:00:05 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-07 10:45:23 (GMT) |
commit | 7cc67c0392b630942e06d9213a517de70670d870 (patch) | |
tree | cb15bc2431e0bf34f4eca98b3bdf59b1fa83ab22 /tests | |
parent | 712ecafd07eae7e5e3bd2ca5f50703debf966a63 (diff) | |
download | Qt-7cc67c0392b630942e06d9213a517de70670d870.zip Qt-7cc67c0392b630942e06d9213a517de70670d870.tar.gz Qt-7cc67c0392b630942e06d9213a517de70670d870.tar.bz2 |
Bump Qt version to 4.8.5
Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/mediaobject/dummy/dummy.pro | 2 | ||||
-rw-r--r-- | tests/auto/selftests/expected_cmptest.txt | 2 | ||||
-rw-r--r-- | tests/auto/selftests/expected_crashes_3.txt | 2 | ||||
-rw-r--r-- | tests/auto/selftests/expected_longstring.txt | 2 | ||||
-rw-r--r-- | tests/auto/selftests/expected_maxwarnings.txt | 2 | ||||
-rw-r--r-- | tests/auto/selftests/expected_skip.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/mediaobject/dummy/dummy.pro b/tests/auto/mediaobject/dummy/dummy.pro index ba3e8e8..50ed802 100644 --- a/tests/auto/mediaobject/dummy/dummy.pro +++ b/tests/auto/mediaobject/dummy/dummy.pro @@ -1,7 +1,7 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.8.4 + VERSION=4.8.5 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt index 72036db..dae2633 100644 --- a/tests/auto/selftests/expected_cmptest.txt +++ b/tests/auto/selftests/expected_cmptest.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Cmptest ********* -Config: Using QTest library 4.8.4, Qt 4.8.4 +Config: Using QTest library 4.8.5, Qt 4.8.5 PASS : tst_Cmptest::initTestCase() PASS : tst_Cmptest::compare_boolfuncs() PASS : tst_Cmptest::compare_pointerfuncs() diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt index 2253a2c..cad423a 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.8.4, Qt 4.8.4 +Config: Using QTest library 4.8.5, Qt 4.8.5 PASS : tst_Crashes::initTestCase() QFATAL : tst_Crashes::crash() Received signal 11 FAIL! : tst_Crashes::crash() Received a fatal error. diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt index 7cf8e37..8baea53 100644 --- a/tests/auto/selftests/expected_longstring.txt +++ b/tests/auto/selftests/expected_longstring.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_LongString ********* -Config: Using QTest library 4.8.4, Qt 4.8.4 +Config: Using QTest library 4.8.5, Qt 4.8.5 PASS : tst_LongString::initTestCase() FAIL! : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt index 2359cbc..e26b4ae 100644 --- a/tests/auto/selftests/expected_maxwarnings.txt +++ b/tests/auto/selftests/expected_maxwarnings.txt @@ -1,5 +1,5 @@ ********* Start testing of MaxWarnings ********* -Config: Using QTest library 4.8.4, Qt 4.8.4 +Config: Using QTest library 4.8.5, Qt 4.8.5 PASS : MaxWarnings::initTestCase() QWARN : MaxWarnings::warn() 0 QWARN : MaxWarnings::warn() 1 diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt index 6e746a6..94c6137 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.8.4, Qt 4.8.4 +Config: Using QTest library 4.8.5, Qt 4.8.5 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)] |