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/api/qscriptstring.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/api/qscriptstring.cpp')
| -rw-r--r-- | src/script/api/qscriptstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp index aceda42..34767ac 100644 --- a/src/script/api/qscriptstring.cpp +++ b/src/script/api/qscriptstring.cpp @@ -156,7 +156,7 @@ bool QScriptString::operator!=(const QScriptString &other) const /*! \since 4.6 - Attempts to convert this QScriptString to a QtScript array index, + Attempts to convert this QScriptString to a Qt Script array index, and returns the result. If a conversion error occurs, *\a{ok} is set to false; otherwise |