Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (784 commits)
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  QLabel documentation: add warning about sanitizing input
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Mark all Symbian debug binaries debuggable by default
  Preventing QSoftkeyManager giving false positive memory leaks
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)
  Fixed memory leak in QMessageBox::setInformativeText in Symbian
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Fix gamma corrected source color in GL
  Make macdeployqt more robust against usage of symbolic links.
  Memory leak fix in Symbian open file dialog
  Revert binary search in QTextEngine::findItem
  Runonphone with CODA support
  ...

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()