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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (395 commits)
  Using Symbian native mutex type in tst_bench_qmutex
  removing unused headers
  Fix threadstorage test
  removed some memory leaks from tst_qthread
  Removing RFastLock use
  Making RFastLock work for QMutex
  making the QWaitCondition benchmark more reliable
  further review fixes for qthread_symbian.cpp
  Symbian adopted thread monitor review fixes
  Improving init_symbian_thread_handle
  QMutex symbian review changes
  Trigger for using RFastLock
  tst_qthread now using RThread for Symbian native thread testing
  Extra debug info for failures in tst_qSemaphore tryAcquireWithTimeout()
  Using a single monitor thread to monitor all adopted threads
  Attempt to have one thread for all adopted thread monitoring
  Removed unnecessary ref() on QThreadData
  Fixed thread priority code
  Native adopted thread lifetime monitoring
  Symbian native implementation of corelib/thread
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index a287533..80b6e72 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -51,7 +51,7 @@ to either instantiating an object instance, or assigning a property a value.
 QML relies heavily on Qt's meta object system and can only instantiate classes
 that derive from QObject. For visual element types, this will usually mean a subclass
 of QDeclarativeItem; for models used with the view elements, a subclass of QAbstractItemModel;
-and for abitrary objects with properties, a direct subclass of QObject.
+and for arbitrary objects with properties, a direct subclass of QObject.
 
 The QML engine has no intrinsic knowledge of any class types.  Instead the
 programmer must register the C++ types with their corresponding QML names.
@@ -522,7 +522,7 @@ The \c {invite()} method is similarly available if it is declared as a slot.
 \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0
 \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 1
 
-The QML snippet shown above applies a property value source to the \c announcment property.
+The QML snippet shown above applies a property value source to the \c announcement property.
 A property value source generates a value for a property that changes over time.
 
 Property value sources are most commonly used to do animation.  Rather than
@@ -562,7 +562,7 @@ assignment fails does the engine call the \l {QDeclarativePropertyValueSource::}
 the type to also be used in contexts other than just as a value source.
 
 \l {Extending QML -  Property Value Source Example} shows the complete code used
-implement the \c HappyBirthdaySong property value source.
+to implement the \c HappyBirthdaySong property value source.
 
 \section1 Property Binding