diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-18 10:39:16 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-18 10:39:16 (GMT) |
| commit | 0b96a20f201dbd91599ee890f42dd8e452d15f79 (patch) | |
| tree | fbefbfe77e669f7d58a39c2be612a7098e6f7e17 /src/script/api | |
| parent | 379073630202d37cf8e3927dc9745134ac2f5512 (diff) | |
| parent | 7a64a3f67d53a99e6e2200f6481c98013004b4e4 (diff) | |
| download | Qt-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/script/api')
| -rw-r--r-- | src/script/api/qscriptable.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptcontextinfo.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptengineagent.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptstring.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptvalueiterator.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/script/api/qscriptable.cpp b/src/script/api/qscriptable.cpp index 1d1eec1..eb5972c 100644 --- a/src/script/api/qscriptable.cpp +++ b/src/script/api/qscriptable.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \brief The QScriptable class provides access to the Qt Script environment from Qt C++ member functions. \ingroup script - \mainclass + With QScriptEngine::newQObject(), you can expose the signals and slots and properties of any QObject (or subclass) to script diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp index bd121a1..a305116 100644 --- a/src/script/api/qscriptcontextinfo.cpp +++ b/src/script/api/qscriptcontextinfo.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE \brief The QScriptContextInfo class provides additional information about a QScriptContext. \ingroup script - \mainclass + QScriptContextInfo is typically used for debugging purposes. It can provide information about the code being executed, such as the type diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp index d0a60cb..9c352ad 100644 --- a/src/script/api/qscriptengineagent.cpp +++ b/src/script/api/qscriptengineagent.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \brief The QScriptEngineAgent class provides an interface to report events pertaining to QScriptEngine execution. \ingroup script - \mainclass + The QScriptEngineAgent class is the basis of tools that monitor and/or control the execution of a QScriptEngine, such as debuggers and profilers. diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp index c5fd83b..bcafa44 100644 --- a/src/script/api/qscriptstring.cpp +++ b/src/script/api/qscriptstring.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \brief The QScriptString class acts as a handle to "interned" strings in a QScriptEngine. \ingroup script - \mainclass + QScriptString can be used to achieve faster (repeated) property getting/setting, and comparison of property names, of diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index 607570d..195a23b 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE \brief The QScriptValueIterator class provides a Java-style iterator for QScriptValue. \ingroup script - \mainclass + The QScriptValueIterator constructor takes a QScriptValue as argument. After construction, the iterator is located at the very |