summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-31 03:37:47 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-31 03:37:47 (GMT)
commit11214b3cfbf890df00de5a90c143b61477a0a8c6 (patch)
treea94fa5752de13524888e14fb80a6f6343bab600c /src
parent85da2a5d07bf8c56f55a7c89d45d66ef35af0c68 (diff)
parent291679bda83ff1abb9f0bd34740f16357f6e8285 (diff)
downloadQt-11214b3cfbf890df00de5a90c143b61477a0a8c6.zip
Qt-11214b3cfbf890df00de5a90c143b61477a0a8c6.tar.gz
Qt-11214b3cfbf890df00de5a90c143b61477a0a8c6.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qmlstateoperations.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index e10c9ab..858a527 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -285,7 +285,11 @@ QmlStateChangeScript::ActionList QmlStateChangeScript::actions()
/*!
\qmlclass AnchorChanges
- \brief The AnchorChanges element allows you to change anchors in a state.
+ \brief The AnchorChanges element allows you to change the anchors of an item in a state.
+
+ \snippet examples/declarative/anchors/anchor-changes.qml 0
+
+ For more information on anchors see \l {anchor-layout}{Anchor Layouts}.
*/
QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,AnchorChanges,QmlAnchorChanges)
@@ -313,6 +317,11 @@ public:
qreal origHeight;
};
+/*!
+ \qmlproperty Object AnchorChanges::target
+ This property holds the object that the anchors to change belong to
+*/
+
QmlAnchorChanges::QmlAnchorChanges(QObject *parent)
: QmlStateOperation(*(new QmlAnchorChangesPrivate), parent)
{
@@ -354,6 +363,14 @@ void QmlAnchorChanges::setReset(const QString &reset)
d->resetList = d->resetString.split(QLatin1Char(','));
}
+/*!
+ \qmlproperty AnchorLine AnchorChanges::top
+ \qmlproperty AnchorLine AnchorChanges::bottom
+ \qmlproperty AnchorLine AnchorChanges::left
+ \qmlproperty AnchorLine AnchorChanges::right
+ These properties change the \e left, \e top, \e right and \e bottom anchors of the item
+*/
+
QFxAnchorLine QmlAnchorChanges::left() const
{
Q_D(const QmlAnchorChanges);