summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-10-08 12:02:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-08 12:39:55 +0200
commit1deb9e76e6f8dd85e974913ac3234f89dd4925c8 (patch)
treef14c9579e09acfe67816d08f3fe96be1e1e89fdd
parent4673ca52eec52c7b233a4efebf7e2f21be0011c5 (diff)
WS fix in qscriptcontext.cppv5.2.0-beta1
-produced by git-split-ws Change-Id: I1661678174c62971a7bbf4acb2890fdf590d2f3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--src/script/api/qscriptcontext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index 2791cf3..5f51ffe 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -473,7 +473,7 @@ QScriptValue QScriptContext::activationObject() const
return QScriptValue();
/*JSC::CodeBlock *codeBlock = frame->codeBlock();
if (!codeBlock) {
- // non-Qt native function
+ // non-Qt native function
Q_ASSERT(true); //### this should in theorry not happen
result = new (frame)QScript::QScriptActivationObject(frame);
} else {