summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-07-29 06:45:10 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-07-29 06:45:10 (GMT)
commit77bd318b2892ad2a6beefee84c8e1436f4f7f386 (patch)
tree0de55e09200679501da73babed5cce1d4b558781 /src/script
parent7eba68adc4a7862d9474179592e5c8393a7acdbb (diff)
parentd22d08f3f8a70edfc66c0f6c2fd952688b64fcc2 (diff)
downloadQt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.zip
Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.tar.gz
Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.tar.bz2
Merge commit 'qt/master-stable'
Diffstat (limited to 'src/script')
-rw-r--r--src/script/qscriptengine.cpp2
-rw-r--r--src/script/qscriptvalue.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp
index 48ba459..744cf2a 100644
--- a/src/script/qscriptengine.cpp
+++ b/src/script/qscriptengine.cpp
@@ -931,7 +931,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 0c8426f..884a4c0 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -1442,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
{