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/api/qscriptstring.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/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 |