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: (24 commits)
  Fix loading of _debug.dylib plugins under OSX.
  Remove strange binding loop in Repeater test.
  Improve Transform docs.
  Add media elements to the QML Elements docs.
  Doc fix
  typo
  Test cost of importing and resolving types (but not creating objects).
  Make QML 'hello world' tutorial less confusing.
  ModelNode::setObjectValue() must update the object cache.
  Doc improvements, fixes
  Remove references to deleted qmldebugger.
  Fix Rectangle::gradient rotation doc.
  Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
  import "." first - i.e. override it by everything else.
  Set positioner size to final size, rather than some random size mid animation
  Remove effects from element list.
  Fix imageprovider example compilation on Symbian arm
  Remove capability flag not available in public SDKs
  Fix plugin example compilation on Symbian arm
  Fix compilation on Symbian winscw
  ...

1 files changed, 16 insertions, 9 deletions

diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp
index ed9ab3f..8a38103 100644
--- a/src/multimedia/effects/qsoundeffect.cpp
+++ b/src/multimedia/effects/qsoundeffect.cpp
@@ -56,18 +56,25 @@ QT_BEGIN_NAMESPACE
     \since 4.7
     \brief The SoundEffect element provides a way to play sound effects in qml.
 
+    This element is part of the \bold{Qt.multimedia 4.7} module.
+
     The following example plays a wav file on mouse click.
 
     \qml
-    SoundEffect {
-        id: playSound
-        source: "test.wav"
-    }
-    MouseArea {
-        id: playArea
-        anchors.fill: parent
-        onPressed: {
-            playSound.play()
+    import Qt 4.6
+    import Qt.multimedia 4.7
+
+    Item {
+        SoundEffect {
+            id: playSound
+            source: "test.wav"
+        }
+        MouseArea {
+            id: playArea
+            anchors.fill: parent
+            onPressed: {
+                playSound.play()
+            }
         }
     }
     \endqml