summaryrefslogtreecommitdiffstats
path: root/src/testlib
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa: fix qgraphicsview autotestRichard Moe Gustavsen2011-01-281-0/+4
| | | | | | | | | | | | Moving the cursor to the corner of the desktop (0, 0) will typically trigger things to happend in the OS, at least on Mac (spaces, synergy etc). So I changed those tests to move it to (1, 1) instead. The reason to move it to (0, 0) was just to get the mouse away from the window anyway. And second, it takes some time after using QCursor::setPos on Mac before the events from the move actually arrive. And many tests that use this function relies on this. So I introduces a little delay. This alone will fix a couble of tests.
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1764-65/+69
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1064-64/+64
| | | | | | | | Reviewed-by: Trust Me
| * Improve docs for QTEST_MAIN macro.Jason McDonald2010-12-231-1/+5
| | | | | | | | | | | | | | | | The macro doesn't always create a QApplication, it depends on whether QT_GUI_LIB is defined. Task-number: QTBUG-3899 Reviewed-by: Rohan McGovern
| * silence compiler warningsHarald Fernengel2010-11-191-2/+2
| | | | | | | | Silence shadowing warnings from gcc.
* | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-201-0/+3
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| | * Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-111-0/+3
| | | | | | | | | | | | Reviewed-by: trustme
* | | Fixed a shadow warning when including QTestKimmo Kotajärvi2010-10-291-2/+2
|/ / | | | | | | Reviewed-by: Frederik
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-10/+10
|\ \ | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-10/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-042-10/+10
| | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+9
|\ \ \ | |/ / |/| |
| * | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-1/+9
| |/ | | | | | | Reviewed-by: Jørgen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
| | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | Different version from the previous patch: use QElapsedTimerThiago Macieira2010-08-301-2/+3
| | | | | | | | Reviewed-By: Olivier Goffart
* | Compilation after merge.Olivier Goffart2010-08-301-0/+1
| | | | | | | | | | a55f392edc2145a071d0d59cb0fc69b0d5205a76 removed include that was required by new code in master
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Use QElapsedTimer for the benchlib tests.Thiago Macieira2010-08-241-2/+2
| | | | | | | | | | | | | | It's faster to calculate the time with it, since it doesn't need to convert to local time first. Reviewed-By: Harald Fernengel
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1312-70/+253
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cannot enter text through character viewer on Mac (Cocoa) QNAM HTTP: Remove eatWhitespace() hack QNAM: Fix namespaced compilation Revert the addition of the test of QtTest's random feature. QAbstractSocket: Remove warning QNAM Zerocopy: Benchmark tst_qbytearray: Auto test for reserve() tst_qiodevice: Add peek()ing auto test tst_qnetworkreply: Zerocopy auto test tst_qhttpnetworkconnection: Pipelining auto test QNAM Zerocopy: QNAM implementation part QNAM Zerocopy: HTTP implementation part QAbstractSocket: Enable Unbuffered OpenMode for TCP QNativeSocketEngine: Fix wrong debug output Added QObject::senderSignalIndex() Cleanup the connection list logic in QObject::sender Fixed linking against libQtTest on Mac. Added -random option to tests, making the test cases within a test execute in arbitrary order. Very useful for avoiding test cases being dependent on the running order.
| * | Fixed linking against libQtTest on Mac.Rohan McGovern2010-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: `ld: framework not found QtTest' testlib was forcing CONFIG+=debug, which caused only the QtTest_debug variant of the framework to be produced on Mac. Qt libraries shouldn't force release or debug at this level.
| * | Added -random option to tests, making the test cases within a test execute ↵Magne Pettersen Zachrisen2010-08-1113-70/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in arbitrary order. Very useful for avoiding test cases being dependent on the running order. Added -seed option -random to make it possible to reroduce test results. The seed is printed out when -random is specified Added selftests for -random and -seed options Changed int parsing into strtol and QTime->QDateTime as suggested by Mr Macieira, fixed selftests Merge-request: 2362 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-3/+13
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-111-3/+13
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h src/opengl/qglextensions.cpp src/opengl/qglshaderprogram.cpp tests/auto/mediaobject/tst_mediaobject.cpp
| | * Add QDir::homePath() for the log file in QTestFileLogger in testlib on ↵Liang Qi2010-08-031-3/+13
| | | | | | | | | | | | | | | | | | | | | Symbian, both hardware and emulator. Task-number: QTBUG-12622 Reviewed-by: Shane Kearns
* | | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-29/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-201-29/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tools/qtestlib/chart/database.cpp tools/qtestlib/chart/database.h tools/qtestlib/chart/reportgenerator.cpp tools/qtestlib/chart/reportgenerator.h
| | * Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-201-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
* | | Fix a memory leak in the QTestLib.Jedrzej Nowacki2010-07-271-1/+4
|/ / | | | | | | | | | | A comment string wasn't deleted in expectedFailMode. Reviewed-by: Harald Fernengel
* | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-212-50/+22
| | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | Fixed bug where testlib would not respect the -iterations option.Samuel Rødal2010-05-281-1/+1
| | | | | | | | Reviewed-by: Morten Sørvig
* | Improve precision of testlib benchmarking.Samuel Rødal2010-05-282-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 20 ms is a bit too to get a precise measurement due to limited timer resolution. We increase the limit to 50 ms and introduce a warm-up iteration to prevent any state or cache-related issues which can be hard to account for in the tests. On the N900 this seems to decrease the variance of test results by 30 %, and fixes some cases where the results were way off due to hidden state. Task-number: QT-3390 Reviewed-by: Morten Sørvig
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-041-0/+1
|\ \ | |/ | | | | | | Conflicts: translations/translations.pri
| * Fixing small memory leak in testlib.Aleksandar Sasha Babic2010-05-031-0/+1
| | | | | | | | Reviewed-by: Jason Barron
* | Testlib XML flush: use benchmarkMetricName (identifier) overall instead of ↵Thiago Macieira2010-04-291-1/+1
| | | | | | | | benchmarkMetricUnit (human text)
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-213-28/+60
|\ \ | |/ | | | | | | | | | | Conflicts: src/openvg/qpaintengine_vg.cpp src/script/bridge/qscriptqobject_p.h tests/auto/bic/tst_bic.cpp
| * Fixed DataTag missing from testlib XML in some cases.Rohan McGovern2010-04-193-5/+33
| | | | | | | | Task-number: QTBUG-6320
| * Fixed "pass" incident missing from test xml in some casesRohan McGovern2010-04-191-22/+26
| | | | | | | | Task-number: QTBUG-6278
| * Reverted "qwarn" -> "qwarning" attribute change in XML test logs.Rohan McGovern2010-04-191-1/+1
| | | | | | | | | | XML test logger message type changed from "qwarn" to "qwarning" for warnings, apparently accidentally.
| * Fixed failure of tst_selftests::runSubTest(subtest xml)Rohan McGovern2010-04-191-1/+1
| |
* | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-171-2/+2
| |
* | Port QTest::qWait also to use QTimestamp.Thiago Macieira2010-03-171-2/+2
| | | | | | | | | | To avoid using QTimestamp to test QTimestamp, use QTest::qSleep in QTimestamp's own testcase.
* | Cleanup: Removed include file and comment.jasplin2010-03-171-5/+0
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Typo fix in qtestlibMarkus Goetz2010-03-141-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-011-7/+21
| | | | | | | | | | | | | | | | Also adapt QTestLib not to call invokeMethod on unexisting method to avoid warnings Task-number: QTBUG-7331 Reviewed-by: Brad
* | Don't include private headers from public headers.Morten Johan Sørvig2010-02-221-1/+1
| |