diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 20:46:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 20:46:32 (GMT) |
| commit | d30578f95dfec5c24626eb68ab05a489f12fcd03 (patch) | |
| tree | 3413ad64554f40f68fd1d63a8c6e75f168774bcd /tests | |
| parent | 3b367916c00528012c969b453f68749d8c4fdc7d (diff) | |
| parent | bbbd4b8f3949b58d4fd21854241cb46cbc024a80 (diff) | |
| download | Qt-d30578f95dfec5c24626eb68ab05a489f12fcd03.zip Qt-d30578f95dfec5c24626eb68ab05a489f12fcd03.tar.gz Qt-d30578f95dfec5c24626eb68ab05a489f12fcd03.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix drawing text in item view:
Fix the tst_QPluginLoader::loadCorruptElf on 64 bit
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpluginloader/tst_qpluginloader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index 591ef5e..76c2f6e 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -370,15 +370,15 @@ if (sizeof(void*) == 8) { QPluginLoader lib1(SRCDIR "elftest/corrupt1.elf64.so"); QCOMPARE(lib1.load(), false); - QVERIFY(lib1.errorString().contains("not an ELF object")); + QVERIFY(lib1.errorString().contains("not a valid Qt plugin")); QPluginLoader lib2(SRCDIR "elftest/corrupt2.elf64.so"); QCOMPARE(lib2.load(), false); - QVERIFY(lib2.errorString().contains("invalid")); + QVERIFY(lib2.errorString().contains("not a valid Qt plugin")); QPluginLoader lib3(SRCDIR "elftest/corrupt3.elf64.so"); QCOMPARE(lib3.load(), false); - QVERIFY(lib3.errorString().contains("invalid")); + QVERIFY(lib3.errorString().contains("not a valid Qt plugin")); } else if (sizeof(void*) == 4) { QPluginLoader libW(SRCDIR "elftest/corrupt3.elf64.so"); QCOMPARE(libW.load(), false); |