diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 10:13:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 10:13:39 (GMT) |
| commit | 84d781ace01ef8a413616ec83d0a4513beda1ca5 (patch) | |
| tree | 86063ca50d3775a1cce7b8cfe00961294d4983f5 | |
| parent | 991e54881ea827eaab74078dfbded48e45d0b689 (diff) | |
| parent | bf3544fb5cb04d0271fb92bdb683e9b4a2a17816 (diff) | |
| download | Qt-84d781ace01ef8a413616ec83d0a4513beda1ca5.zip Qt-84d781ace01ef8a413616ec83d0a4513beda1ca5.tar.gz Qt-84d781ace01ef8a413616ec83d0a4513beda1ca5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Compilation fix for Metrowerks compiler
| -rw-r--r-- | demos/spectrum/app/levelmeter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/spectrum/app/levelmeter.cpp b/demos/spectrum/app/levelmeter.cpp index eb37684..39e43c9 100644 --- a/demos/spectrum/app/levelmeter.cpp +++ b/demos/spectrum/app/levelmeter.cpp @@ -87,7 +87,7 @@ void LevelMeter::reset() void LevelMeter::levelChanged(qreal rmsLevel, qreal peakLevel, int numSamples) { // Smooth the RMS signal - const qreal smooth = pow(0.9, static_cast<qreal>(numSamples) / 256); // TODO: remove this magic number + const qreal smooth = pow(qreal(0.9), static_cast<qreal>(numSamples) / 256); // TODO: remove this magic number m_rmsLevel = (m_rmsLevel * smooth) + (rmsLevel * (1.0 - smooth)); if (peakLevel > m_decayedPeakLevel) { |