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
  ...

4 files changed, 12 insertions, 2 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 077ed9a..8d2dc61 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -51,7 +51,12 @@ QT_BEGIN_NAMESPACE
     \since 4.7
     \brief The Audio element allows you to add audio playback to a scene.
 
+    This element is part of the \bold{Qt.multimedia 4.7} module.
+
     \qml
+    import Qt 4.6
+    import Qt.multimedia 4.7
+
     Audio { source: "audio/song.mp3" }
     \endqml
 
diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp
index c878fe1..bf112be 100644
--- a/src/imports/multimedia/qdeclarativevideo.cpp
+++ b/src/imports/multimedia/qdeclarativevideo.cpp
@@ -73,7 +73,12 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
     \brief The Video element allows you to add videos to a scene.
     \inherits Item
 
+    This element is part of the \bold{Qt.multimedia 4.7} module.
+
     \qml
+    import Qt 4.6
+    import Qt.multimedia 4.7
+
     Video { source: "video/movie.mpg" }
     \endqml
 
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index e69c235..e98a801 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -623,7 +623,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
     \brief The Particles object generates and moves particles.
     \inherits Item
 
-    Particles are available in the Qt.labs.particles 1.0 module.
+    Particles are available in the \bold{Qt.labs.particles 1.0} module.
 
     This element provides preliminary support for particles in QML,
     and may be heavily changed or removed in later versions.
diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 1ff1078..5db812c 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -123,7 +123,7 @@ public:
 
     This type is made available by importing the \c org.webkit module:
 
-    \b{import org.webkit 1.0}
+    \bold{import org.webkit 1.0}
 
     If the width and height of the item is not set, they will
     dynamically adjust to a size appropriate for the content.