diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-11 23:42:51 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-08-11 23:42:51 (GMT) |
| commit | 72c58996a5fc7c7a1a82fefa5a0034f57383e788 (patch) | |
| tree | cde90f301afe3783f95a683dc0a54d31aafb673e /tests/auto/qreadwritelock | |
| parent | eb5fae761ff2aaf3d35245ac1f9d1ea10c4e84bb (diff) | |
| parent | c7b8fdf5d866b5202dada00ba175606807f69fca (diff) | |
| download | Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.zip Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.tar.gz Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'tests/auto/qreadwritelock')
| -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 720f2b0..18bd65f 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() |