diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 14:05:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-07 14:05:16 +0100 |
| commit | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (patch) | |
| tree | 00442a814126e57c6a36f740669416b79f3dcf13 /src/script/bridge/qscriptqobject.cpp | |
| parent | fbe7ad18c35aa662693836a65af1e5b67522e1bf (diff) | |
| parent | 8ca2081418ad301effb8f08e7a59080c262c0362 (diff) | |
| download | qtscript-689406ac2424095d6cd4e6bcb3430e53a7e7bbfa.tar.gz | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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) { |