summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
Diffstat (limited to 'src/script')
-rw-r--r--src/script/qscriptengine.cpp2
-rw-r--r--src/script/qscriptvalue.cpp18
2 files changed, 12 insertions, 8 deletions
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index de78403..911d714 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -935,7 +935,7 @@ QScriptSyntaxCheckResult QScriptEngine::checkSyntax(const QString &program)
the file name is accessible through the "fileName" property if it's
provided with this function.
- \sa canEvaluate(), hasUncaughtException(), isEvaluating(), abortEvaluation()
+ \sa checkSyntax(), hasUncaughtException(), isEvaluating(), abortEvaluation()
*/
QScriptValue QScriptEngine::evaluate(const QString &program, const QString &fileName, int lineNumber)
{
diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp
index 97ce61a..520e76f 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -574,9 +574,11 @@ void QScriptValue::setPrototype(const QScriptValue &prototype)
}
/*!
- Returns the scope object of this QScriptValue. This function is only
- relevant for function objects. The scope determines how variables are
- resolved when the function is invoked.
+ \since 4.6
+
+ Returns the scope object of this QScriptValue. This function is only
+ relevant for function objects. The scope determines how variables are
+ resolved when the function is invoked.
*/
QScriptValue QScriptValue::scope() const
{
@@ -588,9 +590,11 @@ QScriptValue QScriptValue::scope() const
}
/*!
- Sets the \a scope object of this QScriptValue. This function is only
- relevant for function objects. Changing the scope is useful when creating
- closures; see \l{Nested Functions and the Scope Chain}.
+ \since 4.6
+
+ Sets the \a scope object of this QScriptValue. This function is only
+ relevant for function objects. Changing the scope is useful when creating
+ closures; see \l{Nested Functions and the Scope Chain}.
*/
void QScriptValue::setScope(const QScriptValue &scope)
{
@@ -1438,7 +1442,7 @@ bool QScriptValue::isUndefined() const
Note that function values, variant values, and QObject values are
objects, so this function returns true for such values.
- \sa toObject(), QScriptEngine::newObject()
+ \sa QScriptEngine::toObject(), QScriptEngine::newObject()
*/
bool QScriptValue::isObject() const
{