summaryrefslogtreecommitdiffstats
path: root/src/testlib
Commit message (Collapse)AuthorAgeFilesLines
* Don't include private headers from public headers.Morten Johan Sørvig2010-02-221-1/+1
|
* Merge branch 'master' of git:qt/qtThiago Macieira2010-02-211-1/+21
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/advtutorial2.qdoc doc/src/declarative/advtutorial3.qdoc doc/src/declarative/advtutorial4.qdoc doc/src/declarative/tutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc
| * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-182-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * \ \ Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-1/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-161-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) QLocalSocket::isValid on Windows must check for broken connection fix pipe handle leak in qlocalsocket_win.cpp GraphicsViewBenchmark: Run app in full screen mode on small desktops. Fix Thai text on Windows 7 Fix License headers. QTextCodec::codecForName. Insert in the cache in all cases. Prevented calling the pixmap filter implementations with null pixmaps. Make it possible to run benchmarks with the "-graphicssystem" switch. Add support for running the GraphicsViewBenchmark application manually. Bump version to 4.6.3. Fixed a GLX warning that occured with some Intel chipsets under X11. Fixed compile for maemo6. Cleanup QEglContext & EGLDisplays Moved 'hasAlpha' property from GL2 engine to GL paint device. Remove useless qDebug in QTextCodec autotest QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded Add caching to QTextCodec::codecForName and QTextCodec::codecForMib Add benchmark for QTextCodec Fix several bugs with GL texture cache Compile fix for OpenGL ES. ...
| | | * | | Make it possible to run benchmarks with the "-graphicssystem" switch.Bjørn Erik Nilsen2010-02-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that the "-graphicssystem" switch were not recognized as a valid benchmark option so the test failed to execute with the following warning: "Unknown option: "-graphicssystem"". We have to pass it through to QApplication, in the same fashion as we do for "-qws". Reviewed-by: jasplin
| | * | | | QTestLib: don't crash if data tag requested, none availableJoão Abecasis2010-02-121-1/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specific test functions and data tags are requested from the command line, a non-existing data tag will produce error output *iif* data tags are available for the function. However, if no data tags are available, element 0 in testData would be dereferenced, resulting in a crash. Special case the empty data tag, even if no tags are available, because some loggers (e.g., the QXmlTestLogger) will output results with no tag the same way as those with an empty data tag. Reviewed-by: Morten Sørvig
* | | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-201-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-182-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| * | | | Always accept values reported directly using QTest::setBenchmarkResult.Samuel Rødal2010-02-181-1/+1
| | |/ / | |/| | | | | | | | | | Reviewed-by: jasplin
* | | | Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)Thiago Macieira2010-02-191-1/+5
| |/ / |/| | | | | | | | | | | | | | Task-number: QTBUG-7805 Patch-by: Pino Toscano Reviewed-by: Trust Me
* | | Fix copyright year.Jason McDonald2010-02-162-2/+2
|/ / | | | | | | Reviewed-by: Trust Me
* | Doc: more \since 4.7Volker Hilsheimer2010-02-051-0/+2
| |
* | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-0/+28
| |
* | BenchLib: update the result format and self-test.Thiago Macieira2010-01-271-1/+2
| | | | | | | | | | | | | | | | Since BenchLib now uses floating point for its calculations, we should format both the value per-iteration and the total the same way. Otherwise, it would output something like "2e+08" for the total. Reviewed-by: Morten Sørvig
* | Fix crash handler regression introduced by c7739f7dd.Thiago Macieira2010-01-271-1/+2
| | | | | | | | | | | | | | The crash handler is removed when the FatalSignalHandler object goes out of scope, which it did right inside that if. Reviewed-By: Harald Fernengel
* | Add proper license headers to these files.Thiago Macieira2010-01-261-39/+39
| | | | | | | | This makes the headers:licenseCheck test pass.
* | Merge branch '4.6'Thiago Macieira2010-01-1361-61/+61
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Update copyright year to 2010Jason McDonald2010-01-0661-61/+61
| | | | | | | | Reviewed-by: Trust Me
* | Added QTest::setBenchmarkResult() to public API.jasplin2009-12-1717-84/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A benchmark result can now be registered explicitly using the QTest::setBenchmarkResult() function as an alternative to using a QBENCHMARK* macro. This gives benchmark writers the freedom to compute the benchmark result however they like and not be dependent on the automatic iteration/accumulation algorithm of a QBENCHMARK* macro. The function takes two arguments: a value and a metric. The value must be a non-negative real, while the metric is an enum type. WARNING: The set of available metrics include metrics for which a high value is considered better (i.e. faster) than a low value (one example is 'frames per second'). QTestLib currently does not distinguish between the two cases of "higher is better" and "lower is better", and leaves it to external tools (parsing the QTestLib output) to recognize them and do any necessary conversion. A tool that plots benchmark result history could e.g. convert all "higher is better" to "lower is better". For the 'frames per second' case, this would typically mean converting FPS to SPF (= 1/FPS). Reviewed-by: MortenS
* | Don't force a crash handler in QtTest.Thiago Macieira2009-12-031-1/+12
|/ | | | | | In some cases, it's best to just let the crash happen straight away. Reviewed-by: Harald Fernengel
* API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* QTestLib: do not assert if testLogger object is already destroyedPeter Hartmann2009-10-191-2/+2
| | | | | | | | ... because when dumping signals we might get QThread::finished() etc. when closing the program, and then the testLogger instance might already be deleted. Reviewed-by: Jesper
* QTestLib: do not assert if file is not given in logging functionPeter Hartmann2009-10-191-1/+0
| | | | | | | that assert was triggered when running a test with "-vs" to show all the signals emitted. Reviewed-by: Andy Shaw
* doc: Fixed numerous qdoc errors.Martin Smith2009-10-021-2/+2
|
* Compilation fix for tests thas doesn't include qapplication.hOlivier Goffart2009-09-301-1/+1
|
* Make sure to process the events in QTest::qWaitForWindowShown on X11Olivier Goffart2009-09-301-0/+1
| | | | | | qt_x11_wait_for_window_manager doesn't necesserly process the events Reviewed-by: Denis
* fix warnings about declarations shadowing class members (autotest reported)Jeremy Katz2009-09-291-3/+3
| | | | Reviewed-by: Olivier
* doc: add some more \since 4.6 tagsVolker Hilsheimer2009-09-281-0/+1
|
* Fix qdoc errorJason McDonald2009-09-281-1/+1
| | | | Reviewed-by: Trust Me
* Fix qdoc error.Jason McDonald2009-09-281-1/+1
| | | | Reviewed-by: Trust Me
* Make sure signal handlers are installed on QWSPaul Olav Tvete2009-09-281-1/+5
| | | | | | | | | | | | | QWS already installs message handlers, and this would cause testlib not to install its own handler, causing lots of extra test failures if there is a crash. The proper way would be to make testlib invoke previous handlers, but the quick and easy fix is just to forget about the old ones. The rationale is that the worst thing that can happen is that it will cause a crash, and that was going to happen anyway. Reviewed-by: Jeremy
* Don't warn of an unused 'window' argument.Jan-Arve Sæther2009-09-231-0/+2
|
* qdoc: Added \brief texts to all the since 4.6 functions.Martin Smith2009-09-211-0/+3
|
* Added a QTest::qWaitForWindowShown function that waits for window manager on ↵Denis Dzyubenko2009-09-182-0/+28
| | | | | | | | | | X11. On X11 it calls the qt_x11_wait_for_window_manager from QtGui, allowing to wait until the window has been mapped and reparented into a frame decoration parent. Reviewed-by: Olivier Goffart
* Added missing headers to the testlib.proDenis Dzyubenko2009-09-181-11/+21
| | | | | | This allows them to appear in creator. Reviewed-by: trustme
* Merge branch '4.5' into 4.6Tom Cooksey2009-09-171-1/+1
|\ | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| * compile fix for embedded Linux and defined QT_COORD_TYPETakumi ASAKI2009-09-171-1/+1
| | | | | | | | | | | | | | If we define QT_COORD_TYPE, src/testlib doesn't compile for embedded Linux. Reviewed-By: joerg
| * Update license headers again.Jason McDonald2009-09-0840-160/+160
| | | | | | | | Reviewed-by: Trust Me
* | QCursor support for Symbian OSShane Kearns2009-09-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason Barron Reviewed-By: Alessandro Portale Summary: QT_NO_CURSOR is now not defined for symbian builds Existing QCursor APIs are all supported New public API, QApplication::setNavigationMode, to allow the navigation mode to be set. I.E. on an S60 3.2 phone, some applications will want a virtual mouse cursor (web browser), while others are designed for keypad navigation. Symbian HAL is used for detecting input capabilities. Fix DND, code cleanup & comment QCursor visibility now uses a refcount, and is called from DND and the setNavigationMode so they are both simpler and don't interfere with each other. QApplication::setNavigationMode New public API for configuring cursor/keypad navi style. This links in with ongoing work on the 4-way keypad navi branch, but 2-way and 4-way modes both act as 2-way mode until that is integrated Some of the demos/examples have cursor switched on (those that were not usable with keypad) Virtual mouse support for non touch, non mouse phones (tested on N78) add *.d and .metadata (carbide debug file / workspace dir) to .gitignore System pointers are unavailable when using sprite workaround, so the system cursor shapes are compiled into qtgui as resources. MAC port does this also for shapes that aren't standard on the MAC. Refactor Drag'n'Drop to use QCursor Add test case to check all system cursor shapes Simply a mainwindow containing a label widget for each cursor shape, with the cursor property set appropriately QCursor(QBitmap,QBitmap) supported Fixed problem with the image & mask being inverted when using the QCursor constructor that takes two mono bitmaps. add .make.cache files to .gitignore Correct implementation of QApplication::setOverrideCursor QApplication::restoreOverrideCursor and QApplication::setOverrideCursor are now working correctly on Symbian platform. Performance will be slower compared with other platforms, because the Symbian window server has a cursor associated with each native window. Add test case for custom cursors Create a pixmap cursor and associate it with a widget. No changes to production code, since test passed 1st time ;) Add manual test for QCursor Make cursor independent of construction order Updated to work around window server issue where contruction order affects what cursor is displayed in child windows. Also changed to effectiveWinId following review comments Also fixed a problem which would make qcursor not link if configured with QT_NO_CURSOR Moved some multiply declared extern functions from cpp to _p.h files Implemented Symbian versions of the cursor functions. Merged in work I'd done based on tower. Fill in bits of stub functions based on windows port Removed QT_NO_CURSOR from list of config options forced on symbian Recompiled configure.exe Added stub functions for the missing functions in s60 port
* | Make qtest_gui.h define QT_GUI_LIB to enable GUI tests.Thiago Macieira2009-09-141-0/+8
| | | | | | | | | | | | | | | | | | This also creates a new header called QtTest/QtTestGui. This header is not supported. You should #include <QtTest/QtTest>. But if you're using a build system that is not qmake, QT_GUI_LIB isn't defined, so it's possibly easier to #include this new header. Reviewed-by: Trust Me
* | Move the QT_GUI_LIB check to qtestevent.h instead of qtestmouse.h.Thiago Macieira2009-09-143-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows #including qtestmouse.h and qtestkeyboard directly to get mouse testing. All QtTest headers are still unsupported (you should always include QtTest/QtTest) but we can still fix issues like this. I have verified with the preprocessor that no GUI code is enabled by including QtTest if QT_GUI_LIB isn't defined. This should not bring the MinGW autotest failures back that the a250ca3a3c0 commit was trying to fix. Reviewed-by: Trust Me
* | Fix compilation with QT_NO_CAST_FROM_BYTEARRAY.Till Adam2009-09-131-3/+3
| | | | | | | | | | Merge-request: 1421 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
* | Changed Symbian tests to sleep only when run on emulator.Miikka Heikkinen2009-09-111-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Changed comment to be more accurate and changed ifdefs so that this will only be done for emulator. This issue needs more comprehensive analysis and wide test runs to determine what the pratical impact of removing this delay entirely would be. Task-number: 247270 Reviewed-by: Janne Anttila
* | Some unneeded semicolons lessAlessandro Portale2009-09-091-3/+3
| |
* | Update license headers again.Jason McDonald2009-09-0961-244/+244
| | | | | | | | Reviewed-by: Trust Me
* | Fixed compilation error for qmdiarea and qmdisubwindow test.Gabriel de Dietrich2009-09-071-1/+1
| | | | | | | | Reviewed-by: Olivier
* | Fixed "multiple definition of `QTest::mouseActionNames'" error inRohan McGovern2009-09-051-1/+2
| | | | | | | | projects where two separate compilation units include `qtestmouse.h'.
* | Fixed compile of code which defines QT_NO_CAST_FROM_ASCII and includesRohan McGovern2009-09-051-1/+1
| | | | | | | | qtestmouse.h.