Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master

Conflicts:
	src/corelib/thread/qthread_unix.cpp

1 files changed, 5 insertions, 4 deletions

diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index 65877f9..f78f3c2 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -205,7 +205,7 @@ component destruction.
 Property bindings can be created in JavaScript by assigning the property with a \c function
 that returns the required value.
 
-See \l {Binding Properties from JavaScript} for details.
+See \l {qml-javascript-assignment}{Property Assignment versus Property Binding} for details.
 
 
 \section1 Receiving QML Signals in JavaScript
@@ -224,7 +224,8 @@ in \c script.js:
 
 The \c jsFunction() will now be called whenever MouseArea's \c clicked signal is emitted.
 
-See \l {Connecting signals to methods and other signals} for more information.
+See \l{QML Signal and Handler Event System#Connecting Signals to Methods and Signals}
+{Connecting Signals to Methods and Signals} for more information.
 
 
 \section1 QML JavaScript Restrictions
@@ -292,8 +293,8 @@ To run code after the environment setup has completed, refer to
 
 \o The value of \c this is currently undefined in QML in the majority of contexts
 
-The \c this keyword is supported when \l {Binding Properties from JavaScript}
-{binding properties from JavaScript}. In all other situations, the value of
+The \c this keyword is supported when binding properties from JavaScript. 
+In all other situations, the value of
 \c this is undefined in QML.
 
 To refer to any element, provide an \c id.  For example: