diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
| commit | 54796e0d3150df7dd94e715c095c21fb227139ee (patch) | |
| tree | 28fbc8e03ebe3ad836b7c6ca243213da269f60ac /src/script | |
| parent | ad229913fd89aa0a33fb9b37ac96ff63c89a05f8 (diff) | |
| parent | 9ec7bbcb96149b1ce8a2d62b55c824d71ff292a8 (diff) | |
| download | Qt-54796e0d3150df7dd94e715c095c21fb227139ee.zip Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.gz Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index abaf5f9..64610c7 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -480,7 +480,7 @@ QScriptValue QScriptContext::activationObject() const If \a activation is not an object, this function does nothing. \note For a context corresponding to a JavaScript function, this is only - guarenteed to work if there was an QScriptEngineAgent active on the + guaranteed to work if there was an QScriptEngineAgent active on the engine while the function was evaluated. */ void QScriptContext::setActivationObject(const QScriptValue &activation) |