diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2012-05-28 19:40:02 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 06:27:41 +0200 |
commit | ca6d49e6b4096f5a9737c6aee04e9b22a781aba2 (patch) | |
tree | 5fabb7125253062e4f36490e151a6fad064f82b5 /src/quick/util/qquickstate.cpp | |
parent | 2896a434715d70c73409042d78ecc2e92b8b093b (diff) |
Doc: Grouped Qt Quick types into several groups
-created new groups and converted some overviews into group pages
-edited type documentation and added \ingroup
-articles still need title fixes and link fixes
Groups:
qtquick-visual-types
qtquick-item-graphics
qtquick-shaders
qtquick-canvas
qtquick-text
qtquick-text-validator
qtquick-interaction
qtquick-positioners
qtquick-transformations
qtquick-states
qtquick-animation-define
qtquick-animation-properties
qtquick-animation-control
qtquick-animation-modifiers
qtquick-images-sprites
qtquick-images
qtquick-models
qtquick-containers
qtquick-views
qtquick-paths
qtquick-utility
Task: QTBUG-25685
Change-Id: I81d4df3320bf5daad5cabb5e42408013fb24f464
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/quick/util/qquickstate.cpp')
-rw-r--r-- | src/quick/util/qquickstate.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp index da4dde5af3..f6802b1f43 100644 --- a/src/quick/util/qquickstate.cpp +++ b/src/quick/util/qquickstate.cpp @@ -61,7 +61,7 @@ QQuickAction::QQuickAction() QQuickAction::QQuickAction(QObject *target, const QString &propertyName, const QVariant &value) -: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), +: restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), property(target, propertyName, qmlEngine(target)), toValue(value), fromBinding(0), event(0), specifiedObject(target), specifiedProperty(propertyName) @@ -122,7 +122,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent) /*! \qmlclass State QQuickState \inqmlmodule QtQuick 2 - \ingroup qml-state-elements + \ingroup qtquick-states \brief Defines configurations of objects and properties A \e state is a set of batched changes from the default configuration. @@ -665,7 +665,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert) } if (!found) { QVariant cur = d->revertList.at(ii).property().read(); - QQmlAbstractBinding *delBinding = + QQmlAbstractBinding *delBinding = QQmlPropertyPrivate::setBinding(d->revertList.at(ii).property(), 0); if (delBinding) delBinding->destroy(); @@ -700,7 +700,7 @@ void QQuickState::apply(QQuickTransition *trans, QQuickState *revert) qWarning() << " QQuickAction event:" << action.event->type(); else qWarning() << " QQuickAction:" << action.property.object() - << action.property.name() << "From:" << action.fromValue + << action.property.name() << "From:" << action.fromValue << "To:" << action.toValue; } } |