Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Play whole file in spectrum analyzer demo
  Do not unnecessarily reset state of spectrum demo
  Set SpectrumAnalyserThread parent to 0 before calling moveToThread()
  Avoid being killed by graphics out-of-memory monitor.
  Revert function renaming in QtOpenVG.
  Support tactile feedback in QWidgets from QS60Style
  Support tactile feeedback from QS60Style for QWidgets
  Making the buttons less finger unfriendly
  Readded .def file entries after a little stunt
  Do not crash on Symbian
  Temporarily remove .def file entries for a little stunt
  Fixed crash with QClipboard in Symbian^3
  Fallback to vgWritePixels in drawPixmap.

1 files changed, 2 insertions, 2 deletions

diff --git a/demos/spectrum/app/progressbar.h b/demos/spectrum/app/progressbar.h
index 8514adb..e715cf5 100644
--- a/demos/spectrum/app/progressbar.h
+++ b/demos/spectrum/app/progressbar.h
@@ -57,13 +57,13 @@ public:
     void paintEvent(QPaintEvent *event);
 
 public slots:
-    void bufferDurationChanged(qint64 bufferSize);
+    void bufferLengthChanged(qint64 length);
     void recordPositionChanged(qint64 recordPosition);
     void playPositionChanged(qint64 playPosition);
     void windowChanged(qint64 position, qint64 length);
 
 private:
-    qint64 m_bufferDuration;
+    qint64 m_bufferLength;
     qint64 m_recordPosition;
     qint64 m_playPosition;
     qint64 m_windowPosition;