diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 03:17:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 03:17:54 (GMT) |
| commit | 9188d5c1eead0e616fc4debbab1e6430b741fd9d (patch) | |
| tree | 260c51868061c77ca524c31e4ecbb6215cfc50b0 /doc/src/development | |
| parent | 9ca64357d6ad9a2a9dd212fc5962169ed2c4bbc1 (diff) | |
| parent | a4d1be727573a7a87c523a2ef28074c77d16f165 (diff) | |
| download | Qt-9188d5c1eead0e616fc4debbab1e6430b741fd9d.zip Qt-9188d5c1eead0e616fc4debbab1e6430b741fd9d.tar.gz Qt-9188d5c1eead0e616fc4debbab1e6430b741fd9d.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (231 commits)
Fixed compile warning on Windows.
Fixed painter path drawing on FBO without stencil buffer.
qmake: Make smart library merge architecture-aware
Slovenian translation: some updates and fixes
Fixed memory leak in Symbian when Options menu was launched.
Fixed color of cosmetic pens when printing under Windows.
Fixed infinite loop when loading jpeg without EOI from memory.
Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
Added galician translation
Support multisampled pbuffers under Windows.
tst_qpixmapfilter: Fix compilation in namespace
qtextcodec_symbian: Add few aliases
Give a warning in QPixmap::handle() if pixmap is not X11 class.
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fix one hang of QNAM on Symbian.
Update QtDeclarative def files
Update QtGui def files
Update QtCore bwins def file
Fix Symbian def file for a9e5329168
Make build on Symbian
...
Diffstat (limited to 'doc/src/development')
| -rw-r--r-- | doc/src/development/qtestlib.qdoc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index 0c07747..a83c27e 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -88,10 +88,6 @@ \o Custom types can easily be added to the test data and test output. \endtable - Note: For higher-level GUI and application testing needs, please - see the \l{Third-Party Tools}{Qt testing products provided by - Nokia partners}. - \section1 QTestLib API @@ -218,12 +214,12 @@ \section2 Creating a Benchmark - To create a benchmark, follow the instructions for crating a test and then add a + To create a benchmark, follow the instructions for creating a test and then add a QBENCHMARK macro to the test function that you want to benchmark. \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 12 - The code insde the QBENCHMARK macro will be measured, and possibly also repeated + The code inside the QBENCHMARK macro will be measured, and possibly also repeated several times in order to get an accurate measurement. This depends on the selected measurement back-end. Several back-ends are available. They can be selected on the command line: |