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_benchlibeventcounter.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_benchlibeventcounter.lightxml')
| -rw-r--r-- | tests/auto/selftests/expected_benchlibeventcounter.lightxml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/selftests/expected_benchlibeventcounter.lightxml index 218f4c8916..3bede6de83 100644 --- a/tests/auto/selftests/expected_benchlibeventcounter.lightxml +++ b/tests/auto/selftests/expected_benchlibeventcounter.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="events"> -<Incident type="pass" file="" line="0"> <BenchmarkResult metric="Events" tag="0" value="0" iterations="1" /> <BenchmarkResult metric="Events" tag="1" value="1" iterations="1" /> <BenchmarkResult metric="Events" tag="10" value="10" iterations="1" /> @@ -14,8 +13,8 @@ <BenchmarkResult metric="Events" tag="500" value="500" iterations="1" /> <BenchmarkResult metric="Events" tag="5000" value="5000" iterations="1" /> <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> -<Incident type="pass" file="" line="0"/> +<Incident type="pass" file="" line="0" /> </TestFunction> |