Merge branch '4.6' of ../qt into kinetic-declarativeui

Conflicts:
	src/script/api/qscriptengine.cpp
	src/script/api/qscriptprogram.cpp
	src/script/api/qscriptprogram.h
	src/script/api/qscriptprogram_p.h
	tests/auto/qscriptengine/tst_qscriptengine.cpp
	tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
	tools/qdoc3/test/qt-inc.qdocconf

3 files changed, 26 insertions, 5 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d040d3d..6c53242 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -2341,6 +2341,11 @@ For example:
     of this variable is typically handled by \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    \section1 QMAKE_LFLAGS_RPATH
+    
+    Library paths in this definition are added to the executable at link
+    time so that the added paths will be preferentially searched at runtime.
+    
     \section1 QMAKE_LFLAGS_QT_DLL
 
     This variable contains link flags when building programs that
@@ -2667,6 +2672,16 @@ For example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 45
 
+    \section1 QMAKE_RPATH
+
+    Is equivalent to \l QMAKE_LFLAGS_RPATH.
+
+    \section1 QMAKE_RPATHDIR
+
+    A list of library directory paths, these paths are added to the
+    executable at link time so that the paths will be preferentially
+    searched at runtime.
+
     \section1 QMAKE_RUN_CC
 
     This variable specifies the individual rule needed to build an object.
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 8269552..e127429 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -963,16 +963,23 @@ Symbian platform, see \l{Symbian platform - Introduction to using Qt}.
 
     Qt for Symbian platform requires the following software installed on your development PC:
     \list
-        \o \l{http://www.mingw.org/}{MinGW 3.4.5 or higher}, or another windows compiler to build the tools.
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}           
            \list
            \o \bold{Note:} It may be necessary to update the Carbide compiler.
               See \l{http://pepper.troll.no/s60prereleases/patches/}{here} for instructions how to check your
               compiler version and how to patch it, if needed.
            \endlist
+        \o \l{http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.msi}{ActivePerl v5.6.1 build 638}
+           \list
+           \o \bold{Note:} According to Symbian, version 5.6.1 build 638 is mandatory. Using later versions may result in unexplained errors.
+           \endlist
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
         \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. 
            Install this to all Symbian SDKs you plan to use Qt with.
+        \o Building Qt tools from scratch requires \l{http://www.mingw.org/}{MinGW 3.4.5 or higher}, or another windows compiler.
+           \list
+           \o \bold{Note:} This is not required if you are using pre-built binary package.
+           \endlist
         \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 686] or later,
            which is not available free of charge. 
     \endlist
diff --git a/doc/src/platforms/qt-embedded.qdoc b/doc/src/platforms/qt-embedded.qdoc
index c39a967..e0c35cc 100644
--- a/doc/src/platforms/qt-embedded.qdoc
+++ b/doc/src/platforms/qt-embedded.qdoc
@@ -68,10 +68,9 @@
     environment and use native features, such as menus, to conform
     to the native style guidelines.
     \o \l{Symbian platform - Introduction to using Qt}{Qt for the Symbian
-platform} is used to create
-    applications running in existing Symbian platform environments.
-    Applications use the appropriate style for the embedded
-    environment and use native features, such as menus, to conform
+    platform} is used to create applications running in existing Symbian
+    platform environments. Applications use the appropriate style for the
+    embedded environment and use native features, such as menus, to conform
     to the native style guidelines.
     \endtable
 */