diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-06-11 15:14:59 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-06-12 17:44:13 +0000 |
| commit | eb3fed53f75abd15203d4c749e4815a74f1fccb2 (patch) | |
| tree | 348b303bc68082ccc96198335ff3b5c5e09aa553 | |
| parent | abe26ee695fbcb2b896064b1b00e00392bce8c66 (diff) | |
Fix broken connection due to API change in b1ace55v5.7.0
Fixed by also removing QMatrix4x4 argument in the camera's
viewMatrixChanged() signal.
Task-number: QTBUG-54039
Change-Id: Icf050aa73a684df824ed34584340911ec6b83f7f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/render/frontend/qcamera.cpp | 4 | ||||
| -rw-r--r-- | src/render/frontend/qcamera.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp index abff13ed5..7b2df1127 100644 --- a/src/render/frontend/qcamera.cpp +++ b/src/render/frontend/qcamera.cpp @@ -94,7 +94,7 @@ QCamera::QCamera(Qt3DCore::QNode *parent) QObject::connect(d_func()->m_lens, SIGNAL(bottomChanged(float)), this, SIGNAL(bottomChanged(float))); QObject::connect(d_func()->m_lens, SIGNAL(topChanged(float)), this, SIGNAL(topChanged(float))); QObject::connect(d_func()->m_lens, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &)), this, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &))); - QObject::connect(d_func()->m_transform, SIGNAL(matrixChanged(const QMatrix4x4 &)), this, SIGNAL(viewMatrixChanged(const QMatrix4x4 &))); + QObject::connect(d_func()->m_transform, SIGNAL(matrixChanged()), this, SIGNAL(viewMatrixChanged())); addComponent(d_func()->m_lens); addComponent(d_func()->m_transform); } @@ -122,7 +122,7 @@ QCamera::QCamera(QCameraPrivate &dd, Qt3DCore::QNode *parent) QObject::connect(d_func()->m_lens, SIGNAL(bottomChanged(float)), this, SIGNAL(bottomChanged(float))); QObject::connect(d_func()->m_lens, SIGNAL(topChanged(float)), this, SIGNAL(topChanged(float))); QObject::connect(d_func()->m_lens, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &)), this, SIGNAL(projectionMatrixChanged(const QMatrix4x4 &))); - QObject::connect(d_func()->m_transform, SIGNAL(matrixChanged(const QMatrix4x4 &)), this, SIGNAL(viewMatrixChanged(const QMatrix4x4 &))); + QObject::connect(d_func()->m_transform, SIGNAL(matrixChanged()), this, SIGNAL(viewMatrixChanged())); addComponent(d_func()->m_lens); addComponent(d_func()->m_transform); } diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index 73ab05cca..9c2997ba0 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -162,7 +162,7 @@ Q_SIGNALS: void upVectorChanged(const QVector3D &upVector); void viewCenterChanged(const QVector3D &viewCenter); void viewVectorChanged(const QVector3D &viewVector); - void viewMatrixChanged(const QMatrix4x4 &viewMatrix); + void viewMatrixChanged(); protected: Q_DECLARE_PRIVATE(QCamera) |