summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-10-22 12:36:05 +0200
committerKai Köhne <kai.koehne@qt.io>2021-10-28 10:23:59 +0200
commit02fd7d7b488f0fd63c5c9d10977f4ab4b653fe27 (patch)
treeafef64543ec82d61f1a85ed84ecf064d3b8f47e2 /src/animation
parentced929aa14e942d26663d715957f236666a13879 (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')
-rw-r--r--src/animation/frontend/qanimationclipdata.cpp4
-rw-r--r--src/animation/frontend/qchannel.cpp4
-rw-r--r--src/animation/frontend/qchannelcomponent.cpp4
3 files changed, 6 insertions, 6 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->();
}
diff --git a/src/animation/frontend/qchannel.cpp b/src/animation/frontend/qchannel.cpp
index 0e944dd6e..b5a471d22 100644
--- a/src/animation/frontend/qchannel.cpp
+++ b/src/animation/frontend/qchannel.cpp
@@ -138,12 +138,12 @@ void QChannel::clearChannelComponents()
QChannel::const_iterator QChannel::begin() const noexcept
{
- return d->m_channelComponents.cbegin();
+ return d->m_channelComponents.cbegin().operator->();
}
QChannel::const_iterator QChannel::end() const noexcept
{
- return d->m_channelComponents.cend();
+ return d->m_channelComponents.cend().operator->();
}
bool operator==(const QChannel &lhs, const QChannel &rhs) noexcept
diff --git a/src/animation/frontend/qchannelcomponent.cpp b/src/animation/frontend/qchannelcomponent.cpp
index e5a19f93d..3e3e07616 100644
--- a/src/animation/frontend/qchannelcomponent.cpp
+++ b/src/animation/frontend/qchannelcomponent.cpp
@@ -117,12 +117,12 @@ void QChannelComponent::clearKeyFrames()
QChannelComponent::const_iterator QChannelComponent::begin() const noexcept
{
- return d->m_keyFrames.cbegin();
+ return d->m_keyFrames.cbegin().operator->();
}
QChannelComponent::const_iterator QChannelComponent::end() const noexcept
{
- return d->m_keyFrames.cend();
+ return d->m_keyFrames.cend().operator->();
}
bool operator==(const QChannelComponent &lhs, const QChannelComponent &rhs) noexcept