diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-31 14:40:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-02 16:23:26 +0000 |
commit | 6ee2028354f06afca42f2cb33fe53ce323de1b95 (patch) | |
tree | 2710379dccb7cb63540bf075993ff7e2ac516650 /src/qml/animations | |
parent | e7dae6e672b675a9cdab58bcef4ac22bc494c256 (diff) |
Improve debug formatting of QAbstractAnimationJob and related classes.
- Output the state.
- Add output to QQuickAnimatorJob.
- Add a private export to the debug operator for use by
QQuickAnimatorProxyJob to format its contained job.
Task-number: QTBUG-45220
Change-Id: Ic64bb5d949864de1c4fb322d53acc3e253977e5d
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/qml/animations')
-rw-r--r-- | src/qml/animations/qabstractanimationjob.cpp | 3 | ||||
-rw-r--r-- | src/qml/animations/qabstractanimationjob_p.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp index 9548a18553..7fcf383bcb 100644 --- a/src/qml/animations/qabstractanimationjob.cpp +++ b/src/qml/animations/qabstractanimationjob.cpp @@ -652,7 +652,8 @@ void QAbstractAnimationJob::removeAnimationChangeListener(QAnimationJobChangeLis void QAbstractAnimationJob::debugAnimation(QDebug d) const { - d << "AbstractAnimationJob(" << hex << (void *) this << dec << ")" << "duration:" << duration(); + d << "AbstractAnimationJob(" << hex << (void *) this << dec << ") state:" + << m_state << "duration:" << duration(); } QDebug operator<<(QDebug d, const QAbstractAnimationJob *job) diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index cba6e35170..5a3e9d2025 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -163,7 +163,7 @@ protected: friend class QQmlAnimationTimer; friend class QAnimationGroupJob; - friend QDebug operator<<(QDebug, const QAbstractAnimationJob *job); + friend Q_QML_PRIVATE_EXPORT QDebug operator<<(QDebug, const QAbstractAnimationJob *job); }; class Q_QML_PRIVATE_EXPORT QAnimationJobChangeListener @@ -234,7 +234,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractAnimationJob::ChangeTypes) -QDebug operator<<(QDebug, const QAbstractAnimationJob *job); +Q_QML_PRIVATE_EXPORT QDebug operator<<(QDebug, const QAbstractAnimationJob *job); QT_END_NAMESPACE |