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/qscriptclass.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/qscriptclass.cpp')
-rw-r--r-- | src/script/api/qscriptclass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp index 2fc2d0a..8e286c8 100644 --- a/src/script/api/qscriptclass.cpp +++ b/src/script/api/qscriptclass.cpp @@ -179,7 +179,7 @@ QScriptEngine *QScriptClass::engine() const your class, then return it in this function. See the "Making Use of Prototype-Based Inheritance" section in the - QtScript documentation for more information on how prototypes are + Qt Script documentation for more information on how prototypes are used. */ QScriptValue QScriptClass::prototype() const |