diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 14:13:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 14:13:33 +0100 |
| commit | 8ca2081418ad301effb8f08e7a59080c262c0362 (patch) | |
| tree | 8787dc1fa3b15f1ea0696a9d30cd1fa2fd47813e /src/script/bridge/qscriptqobject.cpp | |
| parent | 7e1803d382fd199bae12c8e13cd710e51e633a09 (diff) | |
| parent | 82365233831b212a7a230d42ea902d7e5df25e99 (diff) | |
| download | qtscript-8ca2081418ad301effb8f08e7a59080c262c0362.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib100dac4eccddf7a72382b7d1ead7d504a572347
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index a8076bb..1df0264 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -2317,7 +2317,7 @@ int QObjectData::markConnections(JSC::MarkStack& markStack) // This function assumes all objects reachable elsewhere in the JS environment // (stack, heap) have been marked already (see QScriptEnginePrivate::mark()). -// This determines whether any of QtScript's internal QObject wrappers are only +// This determines whether any of Qt Script's internal QObject wrappers are only // weakly referenced and can be discarded. void QObjectData::markWrappers(JSC::MarkStack& markStack) { |