diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-10-20 14:56:38 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-10-25 08:43:24 +0300 |
| commit | 1286bd5bf4348b52ec431be0c37197da9506df6e (patch) | |
| tree | e3bb51e6e458973c26c1a1795059f8b0f3f03528 | |
| parent | 795e474537211d016fc725eec0e1710cc73e8282 (diff) | |
QVector<T>::const_iterator isn't always a const T*
This manifests on android developer builds, where the build of qt3d failed because of this.
Change-Id: Ic3bce6880b0d73f03bb2e27db278edd2981b061e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/animation/frontend/qanimationclipdata.h | 3 | ||||
| -rw-r--r-- | src/animation/frontend/qchannel.h | 3 | ||||
| -rw-r--r-- | src/animation/frontend/qchannelcomponent.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/animation/frontend/qanimationclipdata.h b/src/animation/frontend/qanimationclipdata.h index 11798b373..95804447d 100644 --- a/src/animation/frontend/qanimationclipdata.h +++ b/src/animation/frontend/qanimationclipdata.h @@ -43,6 +43,7 @@ #include <QtCore/qmetatype.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> +#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> #include <Qt3DAnimation/qchannel.h> @@ -76,7 +77,7 @@ public: bool isValid() const noexcept; // Iterator API - typedef const QChannel *const_iterator; + typedef QVector<QChannel>::const_iterator const_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; const_iterator begin() const noexcept; diff --git a/src/animation/frontend/qchannel.h b/src/animation/frontend/qchannel.h index 463cb21e2..b551a1483 100644 --- a/src/animation/frontend/qchannel.h +++ b/src/animation/frontend/qchannel.h @@ -42,6 +42,7 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> +#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> #include <Qt3DAnimation/qchannelcomponent.h> @@ -73,7 +74,7 @@ public: void clearChannelComponents(); // Iterator API - typedef const QChannelComponent *const_iterator; + typedef QVector<QChannelComponent>::const_iterator const_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; const_iterator begin() const noexcept; diff --git a/src/animation/frontend/qchannelcomponent.h b/src/animation/frontend/qchannelcomponent.h index fe9e73ed1..21961c14f 100644 --- a/src/animation/frontend/qchannelcomponent.h +++ b/src/animation/frontend/qchannelcomponent.h @@ -42,6 +42,7 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qstring.h> +#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> #include <Qt3DAnimation/qkeyframe.h> @@ -70,7 +71,7 @@ public: void clearKeyFrames(); // Iterator API - typedef const QKeyFrame *const_iterator; + typedef QVector<QKeyFrame>::const_iterator const_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; const_iterator begin() const noexcept; |