diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-09-12 12:29:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-12 12:35:45 +0200 |
| commit | 1450569eb1789985f67d29ee2cf1cafc3612854b (patch) | |
| tree | dddce735e25a80e971d6a146e82e285ef5763424 | |
| parent | d62b1c5213290644670e9d5fbf9b3f42c82c64a9 (diff) | |
| download | qtmultimedia-1450569eb1789985f67d29ee2cf1cafc3612854b.tar.gz | |
Fix compilation after the qreal->float change in Math3D
QVector3D::length() returns float now, so this qBound call was running
into template substitution failure.
Change-Id: Ib03ab96bf18a4b04fa80a8f706761329faab2541
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| -rw-r--r-- | src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp index 5fba40b9a..4fa314871 100644 --- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp +++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp @@ -379,6 +379,6 @@ void QDeclarativeAttenuationModelInverse::setRolloffFactor(qreal rolloffFactor) qreal QDeclarativeAttenuationModelInverse::calculateGain(const QVector3D &listenerPosition, const QVector3D &sourcePosition) const { Q_ASSERT(m_ref > 0); - return m_ref / (m_ref + (qBound(m_ref, (listenerPosition - sourcePosition).length(), m_max) - m_ref) * m_rolloff); + return m_ref / (m_ref + (qBound<qreal>(m_ref, (listenerPosition - sourcePosition).length(), m_max) - m_ref) * m_rolloff); } |