diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-03 11:46:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-03 11:46:09 (GMT) |
| commit | 1d5041c712acd10020c38a92f1eedc88368ca19f (patch) | |
| tree | fb2d4e31c8232456d10bd70a67000076c8d2d48a /tests/auto/qmutexlocker | |
| parent | 68ad4618e02d1686e37b979fbf1fd1f349aa6d4f (diff) | |
| parent | 7f5797a784e237672f291055020ef4bbb6199893 (diff) | |
| download | Qt-4.8.0-beta.zip Qt-4.8.0-beta.tar.gz Qt-4.8.0-beta.tar.bz2 | |
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/qmutexlocker')
| -rw-r--r-- | tests/auto/qmutexlocker/tst_qmutexlocker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp index c9821f5..a663b60 100644 --- a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp +++ b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp @@ -182,7 +182,7 @@ void tst_QMutexLocker::unlockAndRelockTest() releaseThread(); waitForThread(); - // mutex has been explicity relocked via QMutexLocker + // mutex has been explicitly relocked via QMutexLocker QVERIFY(!thread->mutex.tryLock()); releaseThread(); |