diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-30 03:26:05 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-30 03:26:05 (GMT) |
| commit | 0ee6bf1226f3069f117d0b0b75df14ddf38e75de (patch) | |
| tree | 01a63f8585790624e1746ba1b43cd91731699e42 /src/declarative/util/qmlstate.cpp | |
| parent | 0a4b78de06b60a5fc0a9182687ded099968c4055 (diff) | |
| parent | 0282ea19722c247157c652ef9122379f0e715497 (diff) | |
| download | Qt-0ee6bf1226f3069f117d0b0b75df14ddf38e75de.zip Qt-0ee6bf1226f3069f117d0b0b75df14ddf38e75de.tar.gz Qt-0ee6bf1226f3069f117d0b0b75df14ddf38e75de.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlstate.cpp')
| -rw-r--r-- | src/declarative/util/qmlstate.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 5850a97..cd33f5e 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -175,7 +175,6 @@ void QmlState::setWhen(QmlBindableValue *when) } /*! - \advanced \qmlproperty string State::extends This property holds the state that this state extends |