diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-08-09 12:28:26 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2010-08-09 12:28:26 (GMT) |
commit | 725ee520b7e30c22e3c66e2524b718f4da8222d8 (patch) | |
tree | bba69f5462824d34845508de0add650c92532510 /src/script/api/qscriptcontext.cpp | |
parent | 6648d81c880012bad52380bd73bbe92d68260f7e (diff) | |
parent | 662f87ad52ea75229ce18b19983890425cc45298 (diff) | |
download | Qt-725ee520b7e30c22e3c66e2524b718f4da8222d8.zip Qt-725ee520b7e30c22e3c66e2524b718f4da8222d8.tar.gz Qt-725ee520b7e30c22e3c66e2524b718f4da8222d8.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/api/qscriptcontext.cpp')
-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 1a11100..abaf5f9 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -324,7 +324,7 @@ QScriptValue QScriptContext::argumentsObject() const When a function is called as constructor, the thisObject() contains the newly constructed object to be initialized. - \note This function is only guarenteed to work for a context + \note This function is only guaranteed to work for a context corresponding to native functions. */ bool QScriptContext::isCalledAsConstructor() const |