diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-09-01 08:19:57 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-09-01 08:19:57 (GMT) |
| commit | 22fe21e22cf3a8aedea57e419034ed3245b10c0d (patch) | |
| tree | d846ea9295f357204019f9b56286a5903da04819 /src/script/api/qscriptengine.cpp | |
| parent | 1ec0155c191e2818f56815ee4ddbf5d8982f1267 (diff) | |
| parent | 7b6028276cf5de1ffd5ab8d6dede7cca12e906fd (diff) | |
| download | Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.zip Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.tar.gz Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 8347626..07aced4 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -2626,8 +2626,7 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file } /*! - \internal - \since 4.6 + \since 4.7 Evaluates the given \a program and returns the result of the evaluation. |