diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:49:40 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:55:40 +0200 |
| commit | a6b6e760ac2f019b9ca42847b9535207966811aa (patch) | |
| tree | cdba2823eb3708f7a40593ff69b81d2be88515ea /tests/auto/selftests/expected_warnings.lightxml | |
| parent | 48ba459580c9e4ce28dbb2c3ce433175148da5a1 (diff) | |
| parent | 8ed47d961dc7e6f161030654d11cd330a542eadf (diff) | |
Merge remote branch 'gerrit/master' into HEAD
Conflicts:
configure.exe
src/corelib/global/qglobal.h
src/gui/kernel/qplatformnativeinterface_qpa.h
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qmenu_mac.mm
src/gui/widgets/qmenu_p.h
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qmenubar_p.h
src/gui/widgets/widgets.pri
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h
src/src.pro
tests/auto/qdir/tst_qdir.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qstring/tst_qstring.cpp
Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
Diffstat (limited to 'tests/auto/selftests/expected_warnings.lightxml')
| -rw-r--r-- | tests/auto/selftests/expected_warnings.lightxml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/selftests/expected_warnings.lightxml b/tests/auto/selftests/expected_warnings.lightxml index 4e0ae8a789..116156ed8a 100644 --- a/tests/auto/selftests/expected_warnings.lightxml +++ b/tests/auto/selftests/expected_warnings.lightxml @@ -3,10 +3,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="pass" file="" line="0"/> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testWarnings"> -<Incident type="pass" file="" line="0"> <Message type="qwarn" file="" line="0"> <Description><![CDATA[Warning]]></Description> </Message> @@ -25,19 +24,19 @@ <Message type="qdebug" file="" line="0"> <Description><![CDATA[Baba]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testMissingWarnings"> -<Incident type="fail" file="" line="0"> <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive message: "Warning0"]]></Description> </Message> <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> +<Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> </TestFunction> <TestFunction name="cleanupTestCase"> -<Incident type="pass" file="" line="0"/> +<Incident type="pass" file="" line="0" /> </TestFunction> |