summaryrefslogtreecommitdiffstats
path: root/src/scripttools
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-18 10:39:16 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-18 10:39:16 (GMT)
commit0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch)
treefbefbfe77e669f7d58a39c2be612a7098e6f7e17 /src/scripttools
parent379073630202d37cf8e3927dc9745134ac2f5512 (diff)
parent7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff)
downloadQt-0b96a20f201dbd91599ee890f42dd8e452d15f79.zip
Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.gz
Qt-0b96a20f201dbd91599ee890f42dd8e452d15f79.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
Diffstat (limited to 'src/scripttools')
-rw-r--r--src/scripttools/debugging/qscriptdebugger.cpp4
-rw-r--r--src/scripttools/debugging/qscriptenginedebugger.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index 8797955..c9bc650 100644
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -136,8 +136,8 @@ static bool scriptDebuggerEventCallback(void **data)
\brief The QScriptDebugger class provides a Qt Script debugger.
- \ingroup scripttools
- \mainclass
+ \ingroup script
+
*/
class QScriptDebuggerPrivate
diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp
index b8ed4ea..0588109 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.cpp
+++ b/src/scripttools/debugging/qscriptenginedebugger.cpp
@@ -75,8 +75,8 @@ public:
\brief The QScriptEngineDebugger class provides a QScriptEngine debugger.
- \ingroup scripttools
- \mainclass
+ \ingroup script
+
The QScriptEngineDebugger class provides a debugger that can be
embedded into Qt applications that use Qt Script. The debugger