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/qreadlocker/tst_qreadlocker.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/qreadlocker/tst_qreadlocker.cpp')
| -rw-r--r-- | tests/auto/qreadlocker/tst_qreadlocker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qreadlocker/tst_qreadlocker.cpp b/tests/auto/qreadlocker/tst_qreadlocker.cpp index 7e9700fe5d..3ec9f1cb25 100644 --- a/tests/auto/qreadlocker/tst_qreadlocker.cpp +++ b/tests/auto/qreadlocker/tst_qreadlocker.cpp @@ -177,7 +177,7 @@ void tst_QReadLocker::unlockAndRelockTest() releaseThread(); waitForThread(); - // lock has been explicity relocked via QReadLocker + // lock has been explicitly relocked via QReadLocker QVERIFY(!thread->lock.tryLockForWrite()); releaseThread(); |