diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-07-27 12:19:55 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-07-27 12:19:55 (GMT) |
| commit | 4b696ce11ffed279ed92c63bb85cbcdaab818033 (patch) | |
| tree | 1c803fe730b7e90679b253bbf599e5ec092059c6 /src/script/qscriptengine.cpp | |
| parent | ed00fff3cb3f3f1ec01f5d69168222c3ce8d51b2 (diff) | |
| parent | 29031b406f0266b0b47ef7e8113ec861a90f201e (diff) | |
| download | Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.zip Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.tar.gz Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/script/qscriptengine.cpp')
| -rw-r--r-- | src/script/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 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) { |