From bf3544fb5cb04d0271fb92bdb683e9b4a2a17816 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 12 May 2010 10:04:52 +0100 Subject: Compilation fix for Metrowerks compiler Compiler was failing to disambiguate the following overloads: pow(double, double) pow(float, float) Reviewed-by: mread --- demos/spectrum/app/levelmeter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(numSamples) / 256); // TODO: remove this magic number + const qreal smooth = pow(qreal(0.9), static_cast(numSamples) / 256); // TODO: remove this magic number m_rmsLevel = (m_rmsLevel * smooth) + (rmsLevel * (1.0 - smooth)); if (peakLevel > m_decayedPeakLevel) { -- cgit v0.12 From c03ecbc6163089f8eb73c97b7bfd05ab6269a278 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Wed, 12 May 2010 15:07:24 +0100 Subject: Fix wins def file for qtgui The .def file contained symbols for both: public: static int __cdecl QEglContext::display(void) public: int __thiscall QEglContext::display(void) const But the autogenerated def file comments showed both of these as just QEglContext::display(void) Leading to confusion. There is some bug in SBSv2 which made the postlink succeed on retry. Task-number: QTBUG-10520 Reviewed-by: Trust Me --- src/s60installs/bwins/QtGuiu.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index c7a23fb..88427ec 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12597,7 +12597,7 @@ EXPORTS ?setConfig@QEglContext@@QAEXH@Z @ 12596 NONAME ; void QEglContext::setConfig(int) ?hasExtension@QEglContext@@SA_NPBD@Z @ 12597 NONAME ABSENT ; bool QEglContext::hasExtension(char const *) ?doneCurrent@QEglContext@@QAE_NXZ @ 12598 NONAME ; bool QEglContext::doneCurrent(void) - ?display@QEglContext@@QBEHXZ @ 12599 NONAME ; int QEglContext::display(void) const + ?display@QEglContext@@QBEHXZ @ 12599 NONAME ABSENT ; int QEglContext::display(void) const ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format) ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API) ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ; class QString QEglContext::errorString(int) -- cgit v0.12