Merge branch '5.10' into dev

Conflicts:
	.qmake.conf

Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d

4 files changed, 7 insertions, 7 deletions

diff --git a/src/animation/frontend/qanimationclipdata.cpp b/src/animation/frontend/qanimationclipdata.cpp
index fe5e7c1e0..1dbbe4a30 100644
--- a/src/animation/frontend/qanimationclipdata.cpp
+++ b/src/animation/frontend/qanimationclipdata.cpp
@@ -122,12 +122,12 @@ bool QAnimationClipData::isValid() const Q_DECL_NOTHROW
 
 QAnimationClipData::const_iterator QAnimationClipData::begin() const Q_DECL_NOTHROW
 {
-    return d->m_channels.begin();
+    return d->m_channels.cbegin();
 }
 
 QAnimationClipData::const_iterator QAnimationClipData::end() const Q_DECL_NOTHROW
 {
-    return d->m_channels.end();
+    return d->m_channels.cend();
 }
 
 
diff --git a/src/animation/frontend/qanimationgroup.h b/src/animation/frontend/qanimationgroup.h
index 1e23c61ee..a4f34c815 100644
--- a/src/animation/frontend/qanimationgroup.h
+++ b/src/animation/frontend/qanimationgroup.h
@@ -37,7 +37,7 @@
 #ifndef QT3DANIMATION_QANIMATIONGROUP_H
 #define QT3DANIMATION_QANIMATIONGROUP_H
 
-#include <qobject.h>
+#include <QtCore/qobject.h>
 
 #include <Qt3DAnimation/qabstractanimation.h>
 
diff --git a/src/animation/frontend/qchannel.cpp b/src/animation/frontend/qchannel.cpp
index f5e4ac7a3..801ad385b 100644
--- a/src/animation/frontend/qchannel.cpp
+++ b/src/animation/frontend/qchannel.cpp
@@ -128,12 +128,12 @@ void QChannel::clearChannelComponents()
 
 QChannel::const_iterator QChannel::begin() const Q_DECL_NOTHROW
 {
-    return d->m_channelComponents.begin();
+    return d->m_channelComponents.cbegin();
 }
 
 QChannel::const_iterator QChannel::end() const Q_DECL_NOTHROW
 {
-    return d->m_channelComponents.end();
+    return d->m_channelComponents.cend();
 }
 
 bool operator==(const QChannel &lhs, const QChannel &rhs) Q_DECL_NOTHROW
diff --git a/src/animation/frontend/qchannelcomponent.cpp b/src/animation/frontend/qchannelcomponent.cpp
index 1ecc5520c..b8511dd1f 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 Q_DECL_NOTHROW
 {
-    return d->m_keyFrames.begin();
+    return d->m_keyFrames.cbegin();
 }
 
 QChannelComponent::const_iterator QChannelComponent::end() const Q_DECL_NOTHROW
 {
-    return d->m_keyFrames.end();
+    return d->m_keyFrames.cend();
 }
 
 bool operator==(const QChannelComponent &lhs, const QChannelComponent &rhs) Q_DECL_NOTHROW