Merge branch 'release' into stable

Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6

4 files changed, 9 insertions, 10 deletions

diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp
index b838f15..15f0966 100644
--- a/src/script/api/qscriptcontextinfo.cpp
+++ b/src/script/api/qscriptcontextinfo.cpp
@@ -159,7 +159,7 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte
             if (returnPC && codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
 #if ENABLE(JIT)
                 JSC::JITCode code = codeBlock->getJITCode();
-                unsigned jitOffset = code.offsetOf(JSC::ReturnAddressPtr(returnPC).value());
+                uintptr_t jitOffset = reinterpret_cast<uintptr_t>(JSC::ReturnAddressPtr(returnPC).value()) - reinterpret_cast<uintptr_t>(code.addressForCall().executableAddress());
                 // We can only use the JIT code offset if it's smaller than the JIT size;
                 // otherwise calling getBytecodeIndex() is meaningless.
                 if (jitOffset < code.size()) {
diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf
index 382e09d..7f8d37c 100644
--- a/src/script/doc/qtscript.qdocconf
+++ b/src/script/doc/qtscript.qdocconf
@@ -16,7 +16,7 @@ headerdirs += ..
 imagedirs += images
 sourcedirs += ..
 
-depends += qtcore qtlinguist
+depends += qtcore qtlinguist qtscripttools
 
 # The following parameters are for creating a qhp file, the qhelpgenerator
 # program can convert the qhp file into a qch file which can be opened in
@@ -32,7 +32,7 @@ qhp.qtscript.file = qtscript.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant.
-qhp.qtscript.namespace = org.qt-project.qtscript.500
+qhp.qtscript.namespace = org.qt-project.qtscript.501
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc
index 7e5af4c..ff4013b 100644
--- a/src/script/doc/src/qtscript-index.qdoc
+++ b/src/script/doc/src/qtscript-index.qdoc
@@ -1637,7 +1637,7 @@
   doesn't provide any debugging-specific functionality (e.g. setting
   breakpoints), but it is the basis of tools that do.
 
-  The QScriptEngineDebugger class introduced in Qt 4.5 provides a 
+  The \l{Qt Script Tools} module provides a
   \l{Qt Script Debugger Manual}{Qt Script debugger} that can be embedded
   into your application.
 
@@ -1876,4 +1876,3 @@
 
     \brief Classes that add scripting capabilities to Qt applications.
 */
-
diff --git a/src/script/doc/src/qtscriptdebugger-manual.qdoc b/src/script/doc/src/qtscriptdebugger-manual.qdoc
index fbad2ed..7de9d6f 100644
--- a/src/script/doc/src/qtscriptdebugger-manual.qdoc
+++ b/src/script/doc/src/qtscriptdebugger-manual.qdoc
@@ -30,8 +30,8 @@
     \title Qt Script Debugger Manual
     \brief A manual describing how to use the Qt Script debugger.
 
-  The Qt Script debugger is a tool for debugging script execution in
-  Qt applications that use Qt Script. Application developers can embed
+  The \l{Qt Script Tools} module provides a debugger for script execution in
+  Qt applications that use \l{Qt Script}. Application developers can embed
   the debugger into their application through the
   QScriptEngineDebugger class. This manual describes how to use the
   debugger. We assume that the reader is somewhat familiar with
@@ -291,7 +291,7 @@
   previously.
 
   \section3 ignore <breakpoint-id> <count>
-  
+
   Sets the ignore-count of a breakpoint, i.e., the breakpoint will not
   stop the program execution unless it have been reached \c count
   times. This can, for instance, be useful in loops to stop at a
@@ -356,7 +356,7 @@
 
   \section3 eval <program>
 
-  Evaluates a program. 
+  Evaluates a program.
 
   \section3 finish
 
@@ -402,7 +402,7 @@
 
   Selects the previous (inner) stack frame. The execution will not
   return to this frame, but you will get access to its local
-  variables. 
+  variables.
 
   \section3 frame <index>