diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-03 21:46:09 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-03 21:46:09 +1000 |
| commit | 1d5041c712acd10020c38a92f1eedc88368ca19f (patch) | |
| tree | fb2d4e31c8232456d10bd70a67000076c8d2d48a /tests/auto/qreadwritelock/tst_qreadwritelock.cpp | |
| parent | 68ad4618e02d1686e37b979fbf1fd1f349aa6d4f (diff) | |
| parent | 7f5797a784e237672f291055020ef4bbb6199893 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationv4.8.0-beta
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixing typo
Diffstat (limited to 'tests/auto/qreadwritelock/tst_qreadwritelock.cpp')
| -rw-r--r-- | tests/auto/qreadwritelock/tst_qreadwritelock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp index 720f2b0d67..18bd65f2f5 100644 --- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp @@ -665,7 +665,7 @@ public: /* - A writer aquires a read-lock, a reader locks + A writer adquires a read-lock, a reader locks the writer releases the lock, the reader gets the lock */ void tst_QReadWriteLock::readLockBlockRelease() @@ -682,7 +682,7 @@ void tst_QReadWriteLock::readLockBlockRelease() } /* - writer1 aquires a read-lock, writer2 blocks, + writer1 adquires a read-lock, writer2 blocks, writer1 releases the lock, writer2 gets the lock */ void tst_QReadWriteLock::writeLockBlockRelease() @@ -698,7 +698,7 @@ void tst_QReadWriteLock::writeLockBlockRelease() QVERIFY(threadDone); } /* - Two readers aquire a read-lock, one writer attempts a write block, + Two readers adquire a read-lock, one writer attempts a write block, the readers release their locks, the writer gets the lock. */ void tst_QReadWriteLock::multipleReadersBlockRelease() |