diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 16:00:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 16:00:59 (GMT) |
| commit | b4230429e1a691643f23cfe8aa354779e94288b0 (patch) | |
| tree | 5247912e8b2a9c6e9eb362818760430d06803c63 /src/script/api/qscriptengine.cpp | |
| parent | 592790602944a769db2ffd6d04e9e9fc023186e0 (diff) | |
| parent | 9d92e1556b18db068891c0f33ff35c8f05059b73 (diff) | |
| download | Qt-b4230429e1a691643f23cfe8aa354779e94288b0.zip Qt-b4230429e1a691643f23cfe8aa354779e94288b0.tar.gz Qt-b4230429e1a691643f23cfe8aa354779e94288b0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated Twitter demo in response to the new Twitter oauth requirement
doc: Remove \internal tag from QScriptProgram
Doc: Reviewed updates to the model/view tutorial.
QNetworkAccessManager doc: add since tag for added enum
fixed compilation problem
added missing files
added missing files
problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables
moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
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. |