summaryrefslogtreecommitdiff
path: root/src/3rdparty/javascriptcore/JavaScriptCore
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp4
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
index 9269fdd..4300a57 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
@@ -852,7 +852,7 @@ JSValue Interpreter::execute(EvalExecutable* eval, CallFrame* callFrame, JSObjec
}
Register* oldEnd = m_registerFile.end();
-#ifdef QT_BUILD_SCRIPT_LIB //with QtScript, we do not necesserly start from scratch
+#ifdef QT_BUILD_SCRIPT_LIB //with Qt Script, we do not necesserly start from scratch
Register* newEnd = oldEnd + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
#else
Register* newEnd = m_registerFile.start() + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
@@ -862,7 +862,7 @@ JSValue Interpreter::execute(EvalExecutable* eval, CallFrame* callFrame, JSObjec
return jsNull();
}
-#ifdef QT_BUILD_SCRIPT_LIB //with QtScript, we do not necesserly start from scratch
+#ifdef QT_BUILD_SCRIPT_LIB //with Qt Script, we do not necesserly start from scratch
CallFrame* newCallFrame = CallFrame::create(oldEnd + globalRegisterOffset);
#else
CallFrame* newCallFrame = CallFrame::create(m_registerFile.start() + globalRegisterOffset);
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
index d8027ff..1abdf8b 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
@@ -1170,7 +1170,7 @@ DEFINE_STUB_FUNCTION(int, timeout_check)
}
#ifdef QT_BUILD_SCRIPT_LIB
else {
- // It's possible that the call to QtScript's implementation of
+ // It's possible that the call to Qt Script's implementation of
// TimeoutChecker::didTimeOut() caused an error to be thrown.
// In that case, didTimeOut() should still return false, since
// we don't want the interrupted-exception to override the
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
index 053b4c0..06548ce 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
@@ -135,7 +135,7 @@ namespace JSC {
class JSImmediate {
#ifdef QT_BUILD_SCRIPT_LIB
- public: // QtScript needs isImmediate() and from() functions
+ public: // Qt Script needs isImmediate() and from() functions
#else
private:
#endif
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp
index 8706b8d..869267b 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp
@@ -533,7 +533,7 @@ NEVER_INLINE void JSObject::fillGetterPropertySlot(PropertySlot& slot, JSValue*
Structure* JSObject::createInheritorID()
{
#ifdef QT_BUILD_SCRIPT_LIB
- // ### QtScript needs the hasOwnProperty() calls etc. for QScriptObject
+ // ### Qt Script needs the hasOwnProperty() calls etc. for QScriptObject
m_inheritorID = Structure::create(this, TypeInfo(ObjectType, ImplementsHasInstance | JSC::OverridesHasInstance | JSC::OverridesGetOwnPropertySlot | JSC::OverridesMarkChildren | JSC::OverridesGetPropertyNames));
#else
m_inheritorID = JSObject::createStructure(this);