diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 14:51:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:24:39 +0200 |
| commit | 13374ceb165c44658aa97890c37b206859c9a31c (patch) | |
| tree | 562362b196a459ee3449a5a1e60e5216a9dd6984 /src/qml/animations/qparallelanimationgroupjob.cpp | |
| parent | ae47deba4c943c496412530a8d2a5a688ae12038 (diff) | |
| parent | b5d18be5a03406d0aac83856dd41e1525fd14a28 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I2963c1209316fb6755f572969f368970450d7991
Diffstat (limited to 'src/qml/animations/qparallelanimationgroupjob.cpp')
| -rw-r--r-- | src/qml/animations/qparallelanimationgroupjob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/animations/qparallelanimationgroupjob.cpp b/src/qml/animations/qparallelanimationgroupjob.cpp index 700fdf9fd9..420a934ba2 100644 --- a/src/qml/animations/qparallelanimationgroupjob.cpp +++ b/src/qml/animations/qparallelanimationgroupjob.cpp @@ -239,7 +239,7 @@ void QParallelAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimatio void QParallelAnimationGroupJob::debugAnimation(QDebug d) const { - d << "ParallelAnimationGroupJob(" << hex << (const void *) this << dec << ")"; + d << "ParallelAnimationGroupJob(" << Qt::hex << (const void *) this << Qt::dec << ")"; debugChildren(d); } |