diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 00:19:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 00:19:30 (GMT) |
| commit | 5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec (patch) | |
| tree | 7696191028202e958fc25b69a3474ea80c0dcc20 /src/script | |
| parent | 27c257084717faf031ff7c09cf06e7d072d3eedf (diff) | |
| parent | fefc004a71b6744e3ad7d2fe0e1d45824beb3c3a (diff) | |
| download | Qt-5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec.zip Qt-5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec.tar.gz Qt-5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Deprecate QScriptValue::UserRange
Deprecate QScriptValue::QObjectMember
Diffstat (limited to 'src/script')
| -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 079cf92..91ce9c8 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -145,11 +145,11 @@ \value PropertySetter The property is defined by a function which will be called to set the property value. - \value QObjectMember This flag is used to indicate that an existing property is a QObject member (a property or method). + \omitvalue QObjectMember This flag is used to indicate that an existing property is a QObject member (a property or method). \value KeepExistingFlags This value is used to indicate to setProperty() that the property's flags should be left unchanged. If the property doesn't exist, the default flags (0) will be used. - \value UserRange Flags in this range are not used by Qt Script, and can be used for custom purposes. + \omitvalue UserRange Flags in this range are not used by Qt Script, and can be used for custom purposes. */ /*! |