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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
  Optimize QML "parent" property access
  Begin dragging PathView up to the level (quality and functionality) of other views.
  Rename qdeclarativetime -> qmltime
  Auto-test fix.
  Build Fix and port to new width and height properties
  Port Flickable and Flipable to support QGraphicsObject.
  Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef
  Fix the build due to new properties in QGraphicsObject.
  Remove the children property from QDeclarativeItem.
  Rename qdeclarativetime -> qmltime
  Update AnchorChanges to use more natural form for setting anchors.
  Pen is not a creatable type.
  Begin dragging PathView up to the level (quality and functionality) of other views.
  Fix error reporting when symbian file copy fails.
  Stabilize QGraphicsEffect test on X11
  QIODevice::read() and QFile::atEnd() performance improvements
  Clarified pkg_prerules usage documentation.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
  Made it possible to define more than one language using pkg_prerules
  Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero
  ...

2 files changed, 4 insertions, 3 deletions

diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp
index 4b37b18..cb65f6e 100644
--- a/src/multimedia/audio/qaudioinput_mac_p.cpp
+++ b/src/multimedia/audio/qaudioinput_mac_p.cpp
@@ -670,8 +670,8 @@ bool QAudioInputPrivate::open()
     }
 
     // Allocate buffer
-    periodSizeBytes = (numberOfFrames * streamFormat.mSampleRate / deviceFormat.mSampleRate) *
-                        streamFormat.mBytesPerFrame;
+    periodSizeBytes = numberOfFrames * streamFormat.mBytesPerFrame;
+
     if (internalBufferSize < periodSizeBytes * 2)
         internalBufferSize = periodSizeBytes * 2;
     else
diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.cpp b/src/multimedia/audio/qaudiooutput_symbian_p.cpp
index 945a08d..3f8e933 100644
--- a/src/multimedia/audio/qaudiooutput_symbian_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_symbian_p.cpp
@@ -185,10 +185,11 @@ void QAudioOutputPrivate::suspend()
 
         const qint64 samplesWritten = SymbianAudio::Utils::bytesToSamples(
                                           m_format, m_bytesWritten);
-        m_bytesWritten = 0;
 
         const qint64 samplesPlayed = getSamplesPlayed();
 
+        m_bytesWritten = 0;
+
         // CMMFDevSound::Pause() is not guaranteed to work correctly in all
         // implementations, for play-mode DevSound sessions.  We therefore
         // have to implement suspend() by calling CMMFDevSound::Stop().