diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 07:38:13 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 07:38:13 (GMT) |
| commit | ba1cf0a7ef0f8e4d58bbdae6d48c884e70dd5d36 (patch) | |
| tree | 7360b31a3ec2fc6141203b6875c4c2f0ca1245fa /src/script/api/qscriptengine.cpp | |
| parent | be69c316c56379d2b955491ffc54754018079dec (diff) | |
| parent | fc4d386f2cc8984b98957d83d8cdb57c1105890f (diff) | |
| download | Qt-ba1cf0a7ef0f8e4d58bbdae6d48c884e70dd5d36.zip Qt-ba1cf0a7ef0f8e4d58bbdae6d48c884e70dd5d36.tar.gz Qt-ba1cf0a7ef0f8e4d58bbdae6d48c884e70dd5d36.tar.bz2 | |
Merge commit 'staging-1/4.7' into mimir
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. |