summaryrefslogtreecommitdiff
path: root/src/3rdparty/javascriptcore/JavaScriptCore/runtime
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-01-25 20:40:36 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-26 00:36:00 +0100
commit19550797aa16ee60fc19fdaf90832b4895612226 (patch)
treea64ff6780e4d0162173065e7bfcebe6e81b57ff1 /src/3rdparty/javascriptcore/JavaScriptCore/runtime
parentaaddb67d074dcf1965e6c07a7232dd688deac416 (diff)
downloadqtscript-19550797aa16ee60fc19fdaf90832b4895612226.tar.gz
Doc: Fix module name format
Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/runtime')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp2
2 files changed, 2 insertions, 2 deletions
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);