diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-31 07:46:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-31 07:46:34 (GMT) |
| commit | e93d11c733bb44208089a7488c6e7a176468d407 (patch) | |
| tree | 8ca16ca3cd5dc90ed1980ff27409feb381daa69c /src/declarative/util/qdeclarativeanimation.cpp | |
| parent | beecb594267063a877e844538c15f67339bf6a8e (diff) | |
| parent | 0b98430c19a613fa660133b37c83e1abd3d8d1a5 (diff) | |
| download | Qt-e93d11c733bb44208089a7488c6e7a176468d407.zip Qt-e93d11c733bb44208089a7488c6e7a176468d407.tar.gz Qt-e93d11c733bb44208089a7488c6e7a176468d407.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing image
Mention scope of id uniqueness
Update QML Documents example
add license header
doc: Add a note about QCoreApplication::applicationDirPath
Add license header
Add moving and flicking properties to PathView
Improve utility of QMLViewer
Add missing \l doc commands
Document elements that are focus scopes.
Remove use of shared NOTIFY signals in QGraphicsScale
Remove use of shared NOTIFY signals
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 8c1c95a..6a9cf95 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -939,7 +939,7 @@ void QDeclarativePropertyAction::setTarget(QObject *o) if (d->target == o) return; d->target = o; - emit targetChanged(d->target, d->propertyName); + emit targetChanged(); } QString QDeclarativePropertyAction::property() const @@ -954,7 +954,7 @@ void QDeclarativePropertyAction::setProperty(const QString &n) if (d->propertyName == n) return; d->propertyName = n; - emit targetChanged(d->target, d->propertyName); + emit propertyChanged(); } /*! @@ -2104,7 +2104,7 @@ void QDeclarativePropertyAnimation::setTarget(QObject *o) if (d->target == o) return; d->target = o; - emit targetChanged(d->target, d->propertyName); + emit targetChanged(); } QString QDeclarativePropertyAnimation::property() const @@ -2119,7 +2119,7 @@ void QDeclarativePropertyAnimation::setProperty(const QString &n) if (d->propertyName == n) return; d->propertyName = n; - emit targetChanged(d->target, d->propertyName); + emit propertyChanged(); } QString QDeclarativePropertyAnimation::properties() const |