diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-10-22 12:36:05 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-10-28 10:23:59 +0200 |
| commit | 02fd7d7b488f0fd63c5c9d10977f4ab4b653fe27 (patch) | |
| tree | afef64543ec82d61f1a85ed84ecf064d3b8f47e2 /src/animation/frontend/qanimationclipdata.cpp | |
| parent | ced929aa14e942d26663d715957f236666a13879 (diff) | |
Fix compilation with latest qtbase
Make the conversion from QList<Type>::const_iterator to Type* pointer
explicit; since qtbase commit 0220484329029fc75, QList doesn't support
the implicit conversion anymore.
Fixes: QTBUG-97708
Change-Id: Ief96263871c5fd1179bf625d1c3d1c31c5def1c8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/animation/frontend/qanimationclipdata.cpp')
| -rw-r--r-- | src/animation/frontend/qanimationclipdata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/frontend/qanimationclipdata.cpp b/src/animation/frontend/qanimationclipdata.cpp index f68748515..18edf7140 100644 --- a/src/animation/frontend/qanimationclipdata.cpp +++ b/src/animation/frontend/qanimationclipdata.cpp @@ -122,12 +122,12 @@ bool QAnimationClipData::isValid() const noexcept QAnimationClipData::const_iterator QAnimationClipData::begin() const noexcept { - return d->m_channels.cbegin(); + return d->m_channels.cbegin().operator->(); } QAnimationClipData::const_iterator QAnimationClipData::end() const noexcept { - return d->m_channels.cend(); + return d->m_channels.cend().operator->(); } |