diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/animation/frontend/qmorphinganimation.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | 2 | ||||
| -rw-r--r-- | src/render/framegraph/qrendercapture.cpp | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/animation/frontend/qmorphinganimation.cpp b/src/animation/frontend/qmorphinganimation.cpp index 4191b9eab..e8f440c45 100644 --- a/src/animation/frontend/qmorphinganimation.cpp +++ b/src/animation/frontend/qmorphinganimation.cpp @@ -191,7 +191,7 @@ void QMorphingAnimationPrivate::updateAnimation(float position) QVector<int> relevantValues; float sum = 0.0f; - float interpolator; + float interpolator = 0.0f; m_morphKey.resize(m_morphTargets.size()); // calculate morph key diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index 49af741f9..b2fd9ce5b 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -168,6 +168,7 @@ inline QJsonArray vec2jsvec(const QVector4D &v) return arr; } +#if 0 // unused for now inline QJsonArray matrix2jsvec(const QMatrix2x2 &matrix) { QJsonArray jm; @@ -185,6 +186,7 @@ inline QJsonArray matrix2jsvec(const QMatrix3x3 &matrix) jm.append(*mtxp++); return jm; } +#endif inline QJsonArray matrix2jsvec(const QMatrix4x4 &matrix) { diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp index 955345cea..2c513fe1f 100644 --- a/src/render/framegraph/qrendercapture.cpp +++ b/src/render/framegraph/qrendercapture.cpp @@ -305,7 +305,11 @@ void QRenderCapture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) if (reply) { d->setImage(reply, data.data()->image); emit reply->completed(); + +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit reply->completeChanged(true); +QT_WARNING_POP } } } |