diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-18 06:34:18 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-18 06:34:18 (GMT) |
| commit | fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf (patch) | |
| tree | aa2ba4ce64d047d73c29ab0616e8a89d352c3abd /src/script/qscriptengine.cpp | |
| parent | d24029e3d4639f1300e7a68858936911df969f69 (diff) | |
| parent | 572e165dcb8cc8fcdfaa4ab9bdab050f6a6cc173 (diff) | |
| download | Qt-fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf.zip Qt-fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf.tar.gz Qt-fd6740b6ade6e7f8e51a9cc558b723e7fae15ccf.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
doc/src/examples.qdoc
doc/src/plugins-howto.qdoc
doc/src/topics.qdoc
examples/phonon/musicplayer/mainwindow.cpp
src/3rdparty/freetype/src/base/ftobjs.c
src/corelib/global/qglobal.h
src/corelib/tools/qalgorithms.h
src/corelib/tools/qshareddata.cpp
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/tools.pri
src/corelib/xml/qxmlstream.h
src/gui/painting/painting.pri
src/gui/widgets/qdatetimeedit.cpp
tests/auto/qdesktopservices/qdesktopservices.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qtextcodec/test/test.pro
Diffstat (limited to 'src/script/qscriptengine.cpp')
| -rw-r--r-- | src/script/qscriptengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp index 9fc94ae..07fed70 100644 --- a/src/script/qscriptengine.cpp +++ b/src/script/qscriptengine.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE \brief The QScriptEngine class provides an environment for evaluating Qt Script code. \ingroup script - \mainclass + See the \l{QtScript} documentation for information about the Qt Script language, and how to get started with scripting your C++ application. @@ -1338,7 +1338,7 @@ QStringList QScriptEngine::importedExtensions() const Additionally, the type of each element in the sequence should be suitable for conversion to a QScriptValue. - See \l{QtScript Module#Conversion Between QtScript and C++ Types} + See \l{Making Applications Scriptable#Conversion Between QtScript and C++ Types} {Conversion Between QtScript and C++ Types} for more information about the restrictions on types that can be used with QScriptValue. @@ -1359,7 +1359,7 @@ QStringList QScriptEngine::importedExtensions() const Additionally, the type of each element in the sequence must be suitable for conversion to a C++ type from a QScriptValue. - See \l{QtScript Module#Conversion Between QtScript and C++ Types} + See \l{Making Applications Scriptable#Conversion Between QtScript and C++ Types} {Conversion Between QtScript and C++ Types} for more information about the restrictions on types that can be used with QScriptValue. @@ -1754,7 +1754,7 @@ QScriptValue QScriptEngine::objectById(qint64 id) const \brief The QScriptSyntaxCheckResult class provides the result of a script syntax check. \ingroup script - \mainclass + QScriptSyntaxCheckResult is returned by QScriptEngine::checkSyntax() to provide information about the syntactical (in)correctness of a script. |