diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-16 13:41:47 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-16 13:41:47 (GMT) |
| commit | 0efb4c096ff99089b9b6dcbd2f4e4625f845f9de (patch) | |
| tree | 25b9ef670c1f974143fba31a8c6999aa799e5ad3 | |
| parent | accfa1fe0b6b9f77f83cf608013d37720bce8984 (diff) | |
| download | Qt-0efb4c096ff99089b9b6dcbd2f4e4625f845f9de.zip Qt-0efb4c096ff99089b9b6dcbd2f4e4625f845f9de.tar.gz Qt-0efb4c096ff99089b9b6dcbd2f4e4625f845f9de.tar.bz2 | |
Fixed spelling/grammar error.
Reviewed by: David Boddie
Tasks: QTBUG-11926, QTBUG-10174
| -rw-r--r-- | doc/src/development/qtestlib.qdoc | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qatomic.cpp | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index f28337d..b24127c 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -216,12 +216,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: diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index 743da24..697da38 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -48,10 +48,9 @@ For atomic operations on pointers, see the QAtomicPointer class. - An complex operation that completes without interruption is said - to be \e atomic. The QAtomicInt class provides atomic reference - counting, test-and-set, fetch-and-store, and fetch-and-add for - integers. + An \e atomic operation is a complex operation that completes without interruption. + The QAtomicInt class provides atomic reference counting, test-and-set, fetch-and-store, + and fetch-and-add for integers. \section1 Non-atomic convenience operators @@ -635,9 +634,8 @@ For atomic operations on integers, see the QAtomicInt class. - An complex operation that completes without interruption is said - to be \e atomic. The QAtomicPointer class provides atomic - test-and-set, fetch-and-store, and fetch-and-add for pointers. + An \e atomic operation is a complex operation that completes without interruption. + The QAtomicPointer class provides atomic test-and-set, fetch-and-store, and fetch-and-add for pointers. \section1 Non-atomic convenience operators |