diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 07:54:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 07:54:03 (GMT) |
| commit | ebed13e649c1572ed85cb841252e73a479516052 (patch) | |
| tree | 6a48393216426d07fd9e4dda4239948ef2e6ad60 /tests/auto/selftests/expected_assert.lightxml | |
| parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
| parent | 0af72a19fc4f85ca8bb13415a298ec5a646b4544 (diff) | |
| download | Qt-ebed13e649c1572ed85cb841252e73a479516052.zip Qt-ebed13e649c1572ed85cb841252e73a479516052.tar.gz Qt-ebed13e649c1572ed85cb841252e73a479516052.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (72 commits)
Attempt again at fixing the OpenVG paint engine build
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
Fixing the wrong QUrl usage
When on Symbian use smaller files.
correctly position glyphs for complex languages
Removed inneccessary QGlyphLayout::offsets initialization.
Fix mirrored characters for RTL text in Symbian
QNAM: Add a code comment related to the cache
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
QtScript: regression with instanceof operator for QMetaObject wrappers
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
QNAM HTTP: Fixed a bug when getting empty files with pipelining
Fix window transparency on Symbian.
Tweak the 'normalGeometry' of the widget before setting it.
...
Diffstat (limited to 'tests/auto/selftests/expected_assert.lightxml')
| -rw-r--r-- | tests/auto/selftests/expected_assert.lightxml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/selftests/expected_assert.lightxml b/tests/auto/selftests/expected_assert.lightxml new file mode 100644 index 0000000..50b5376 --- /dev/null +++ b/tests/auto/selftests/expected_assert.lightxml @@ -0,0 +1,18 @@ +<Environment> + <QtVersion>4.6.3</QtVersion> + <QTestVersion>4.6.3</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0"/> +</TestFunction> +<TestFunction name="testNumber1"> +<Incident type="pass" file="" line="0"/> +</TestFunction> +<TestFunction name="testNumber2"> +<Incident type="fail" file="Unknown file" line="0"> +<Message type="qfatal" file="" line="0"> + <Description><![CDATA[ASSERT: "false" in file /local/user_builds/qt/4.6/tests/auto/selftests/assert/tst_assert.cpp, line 62]]></Description> +</Message> + <Description><![CDATA[Received a fatal error.]]></Description> +</Incident> +</TestFunction> |