diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:04:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:04:24 +0100 |
| commit | 299c0bc6d2ea5817ba32b3724290c349789be11b (patch) | |
| tree | e4be8e321b2b3064e13e923bb551da48af9e3b49 | |
| parent | e95c9eb84178667a9de5ea0cb9dedb1c9acbc000 (diff) | |
| parent | 698bd5f22c79ecf777a0abe57a36676dc49fa8f3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I0e9568be6b0656765e9b52bec8751a86ef178f68
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 2 | ||||
| -rw-r--r-- | src/logic/qlogicaspect.cpp | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3d/qquaternionanimation.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 1bc57579f..e7ff70326 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -223,7 +223,7 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time) { Q_D(QInputAspect); const qint64 deltaTime = time - d->m_time; - const float dt = static_cast<const float>(deltaTime) / 1.0e9; + const float dt = static_cast<float>(deltaTime) / 1.0e9; d->m_time = time; QVector<QAspectJobPtr> jobs; diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp index d36e9b09d..649a14f25 100644 --- a/src/logic/qlogicaspect.cpp +++ b/src/logic/qlogicaspect.cpp @@ -118,7 +118,7 @@ QVector<QAspectJobPtr> QLogicAspect::jobsToExecute(qint64 time) { Q_D(QLogicAspect); const qint64 deltaTime = time - d->m_time; - const float dt = static_cast<const float>(deltaTime) / 1.0e9; + const float dt = static_cast<float>(deltaTime) / 1.0e9; d->m_manager->setDeltaTime(dt); d->m_time = time; diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp index adccf4d97..22cc905f7 100644 --- a/src/quick3d/quick3d/qquaternionanimation.cpp +++ b/src/quick3d/quick3d/qquaternionanimation.cpp @@ -143,7 +143,10 @@ void QQuaternionAnimation::setType(Type type) d->type = type; switch (type) { case Nlerp: +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC(-Wcast-function-type) d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&q_quaternionNlerpInterpolator); +QT_WARNING_POP break; case Slerp: default: |