diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 16:06:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 16:06:40 (GMT) |
| commit | 4cfd1f19fdcd1e61aa50feed5eb8228afff94e66 (patch) | |
| tree | 159a2f90ff7bb016fd166f1b18826aed2a460ac5 /src/declarative/util | |
| parent | 953ff11a1b424dd288b6504c5a6f918acaebaa60 (diff) | |
| parent | 1a7a1172d048108c30a9890ce9477686711ad756 (diff) | |
| download | Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.zip Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.tar.gz Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 8cb813c..d1d7822 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -648,7 +648,7 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s) } /*! - \qmlproperty script StateChangeScript::script + \qmlproperty string StateChangeScript::name This property holds the name of the script. This name can be used by a ScriptAction to target a specific script. |