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/qscriptvalue.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/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index cfffea2..3e307a2 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -94,7 +94,7 @@ not have the requested property. Note that this prototype-based lookup is not performed by setProperty(); setProperty() will always create the property in the script object itself. For more - information, see the \l{QtScript} documentation. + information, see the \l{Qt Script} documentation. Function objects (objects for which isFunction() returns true) can be invoked by calling call(). Constructor functions can be used to @@ -2014,7 +2014,7 @@ bool QScriptValue::isValid() const /*! \since 4.4 - Returns the internal data of this QScriptValue object. QtScript uses + Returns the internal data of this QScriptValue object. Qt Script uses this property to store the primitive value of Date, String, Number and Boolean objects. For other types of object, custom data may be stored using setData(). |