diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-11-23 01:35:33 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-11-23 01:35:33 (GMT) |
| commit | 7d17956316ac786516f67ba9be511975ff42d898 (patch) | |
| tree | 7d5e4a31c710131742921f0dbce8fbd4285d99f5 /src/script | |
| parent | 280f67d16430ce0dcfcc31a0c88ce7156126066c (diff) | |
| parent | e158714ea545bd74600f121ab726cf2cf848f3b9 (diff) | |
| download | Qt-7d17956316ac786516f67ba9be511975ff42d898.zip Qt-7d17956316ac786516f67ba9be511975ff42d898.tar.gz Qt-7d17956316ac786516f67ba9be511975ff42d898.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptcontextinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp index a90e014..8528dec 100644 --- a/src/script/api/qscriptcontextinfo.cpp +++ b/src/script/api/qscriptcontextinfo.cpp @@ -177,7 +177,7 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte fileName = source->url(); } - // Get the others informations: + // Get the others information: JSC::JSObject *callee = frame->callee(); if (callee && callee->inherits(&JSC::InternalFunction::info)) functionName = JSC::asInternalFunction(callee)->name(frame); |