Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update of the QScriptValue autotest suite.
  New autotests cases for QScriptValue autotests generator.
  QScriptValue autotest generator templates change.
  Fix license template.
  QScriptValue::isQMetaObject crash fix.
  Implement toLatin1_helper with SSE2
  Doc: add \since 4.7 to new QtMultimedia classes
  Autotest: add a test to ensure that the Qt headers are clean.
  Compile on Linux: close(2) is defined in #include <unistd.h>
  Improved gesture event delivery in graphicsview.
  Fixed a gesture autotest.
  Cache scene coordinates of a hotspot in a QGesture.
  Add an extra operator delete() to QSharedPointer's internals.
  Fix compilation on x86 with gcc if SSE2 is not enabled
  Comments the SSE implementation of fromLatin1_helper()
  Build fixes for the SIMD functions
  Implement QString::fromLatin1_helper() with SSE2
  Cache the result of qDetectCPUFeatures()
  Move the SIMD detection from QtGui to QtCore
  Prevent stale QWidget pointers in QCocoaView

20 files changed, 29 insertions, 6 deletions

diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index 21ba8c9..d5ca9e8 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -177,9 +177,10 @@ void QGraphicsVideoItemPrivate::_q_mediaObjectDestroyed()
 
 /*!
     \class QGraphicsVideoItem
-
     \brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject.
 
+    \since 4.7
+
     \ingroup multimedia
 
     Attaching a QGraphicsVideoItem to a QMediaObject allows it to display
diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/base/qmediacontent.cpp
index fd519c6..6f158d2 100644
--- a/src/multimedia/base/qmediacontent.cpp
+++ b/src/multimedia/base/qmediacontent.cpp
@@ -76,6 +76,7 @@ private:
     \class QMediaContent
     \preliminary
     \brief The QMediaContent class provides access to the resources relating to a media content.
+    \since 4.7
 
     \ingroup multimedia
 
diff --git a/src/multimedia/base/qmediacontrol.cpp b/src/multimedia/base/qmediacontrol.cpp
index c8bbfd4..b84c49e 100644
--- a/src/multimedia/base/qmediacontrol.cpp
+++ b/src/multimedia/base/qmediacontrol.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaControl
     \ingroup multimedia-serv
+    \since 4.7
 
     \preliminary
     \brief The QMediaControl class provides a base interface for media service controls.
diff --git a/src/multimedia/base/qmediaobject.cpp b/src/multimedia/base/qmediaobject.cpp
index b2b8c1b..0422718 100644
--- a/src/multimedia/base/qmediaobject.cpp
+++ b/src/multimedia/base/qmediaobject.cpp
@@ -67,6 +67,7 @@ void QMediaObjectPrivate::_q_notify()
     \class QMediaObject
     \preliminary
     \brief The QMediaObject class provides a common base for multimedia objects.
+    \since 4.7
 
     \ingroup multimedia
 
diff --git a/src/multimedia/base/qmediaplaylist.cpp b/src/multimedia/base/qmediaplaylist.cpp
index ab91fd7..b3f3dd3 100644
--- a/src/multimedia/base/qmediaplaylist.cpp
+++ b/src/multimedia/base/qmediaplaylist.cpp
@@ -66,6 +66,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
 /*!
     \class QMediaPlaylist
     \ingroup multimedia
+    \since 4.7
 
     \preliminary
     \brief The QMediaPlaylist class provides a list of media content to play.
diff --git a/src/multimedia/base/qmediaplaylistcontrol.cpp b/src/multimedia/base/qmediaplaylistcontrol.cpp
index 2ae03ad..ba3d224 100644
--- a/src/multimedia/base/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/base/qmediaplaylistcontrol.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaPlaylistControl
     \ingroup multimedia-serv
+    \since 4.7
 
     \preliminary
     \brief The QMediaPlaylistControl class provides access to the playlist functionality of a
diff --git a/src/multimedia/base/qmediaplaylistioplugin.cpp b/src/multimedia/base/qmediaplaylistioplugin.cpp
index 5f11e38..48fd721 100644
--- a/src/multimedia/base/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/base/qmediaplaylistioplugin.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaPlaylistReader
     \preliminary
+    \since 4.7
     \brief The QMediaPlaylistReader class provides an interface for reading a playlist file.
 
     \sa QMediaPlaylistIOPlugin
@@ -83,6 +84,7 @@ QMediaPlaylistReader::~QMediaPlaylistReader()
 /*!
     \class QMediaPlaylistWriter
     \preliminary
+    \since 4.7
     \brief The QMediaPlaylistWriter class provides an interface for writing a playlist file.
 
     \sa QMediaPlaylistIOPlugin
@@ -111,6 +113,7 @@ QMediaPlaylistWriter::~QMediaPlaylistWriter()
 
 /*!
     \class QMediaPlaylistIOPlugin
+    \since 4.7
     \brief The QMediaPlaylistIOPlugin class provides an interface for media playlist I/O plug-ins.
 */
 
diff --git a/src/multimedia/base/qmediaplaylistnavigator.cpp b/src/multimedia/base/qmediaplaylistnavigator.cpp
index 3c22ea4..0c52c71 100644
--- a/src/multimedia/base/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/base/qmediaplaylistnavigator.cpp
@@ -193,6 +193,7 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const
 /*!
     \class QMediaPlaylistNavigator
     \preliminary
+    \since 4.7
     \brief The QMediaPlaylistNavigator class provides navigation for a media playlist.
 
     \sa QMediaPlaylist, QMediaPlaylistProvider
diff --git a/src/multimedia/base/qmediaplaylistprovider.cpp b/src/multimedia/base/qmediaplaylistprovider.cpp
index 65105dc..942f155 100644
--- a/src/multimedia/base/qmediaplaylistprovider.cpp
+++ b/src/multimedia/base/qmediaplaylistprovider.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaPlaylistProvider
     \preliminary
+    \since 4.7
     \brief The QMediaPlaylistProvider class provides an abstract list of media.
 
     \sa QMediaPlaylist
diff --git a/src/multimedia/base/qmediaresource.cpp b/src/multimedia/base/qmediaresource.cpp
index 515e432..646d9a7 100644
--- a/src/multimedia/base/qmediaresource.cpp
+++ b/src/multimedia/base/qmediaresource.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMediaResource
     \preliminary
+    \since 4.7
     \brief The QMediaResource class provides a description of a media resource.
     \ingroup multimedia
 
diff --git a/src/multimedia/base/qmediaservice.cpp b/src/multimedia/base/qmediaservice.cpp
index e40688e..d9e980b 100644
--- a/src/multimedia/base/qmediaservice.cpp
+++ b/src/multimedia/base/qmediaservice.cpp
@@ -57,6 +57,7 @@ QT_MODULE(Multimedia)
     service implementations.
     \ingroup multimedia-serv
     \preliminary
+    \since 4.7
 
     Media services provide implementations of the functionality promised
     by media objects, and allow multiple providers to implement a QMediaObject.
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp
index 02c9b29..eb6505c 100644
--- a/src/multimedia/base/qmediaserviceprovider.cpp
+++ b/src/multimedia/base/qmediaserviceprovider.cpp
@@ -82,6 +82,7 @@ public:
 /*!
     \class QMediaServiceProviderHint
     \preliminary
+    \since 4.7
     \brief The QMediaServiceProviderHint class describes what is required of a QMediaService.
     
     \ingroup multimedia-serv
@@ -489,6 +490,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
 /*!
     \class QMediaServiceProvider
     \preliminary
+    \since 4.7
     \brief The QMediaServiceProvider class provides an abstract allocator for media services.
 */
 
@@ -597,6 +599,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
 /*!
     \class QMediaServiceProviderPlugin
     \preliminary
+    \since 4.7
     \brief The QMediaServiceProviderPlugin class interface provides an interface for QMediaService
     plug-ins.
 
@@ -630,6 +633,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
     \class QMediaServiceSupportedFormatsInterface
     \brief The QMediaServiceSupportedFormatsInterface class interface
     identifies if a media service plug-in supports a media format.
+    \since 4.7
 
     A QMediaServiceProviderPlugin may implement this interface.
 */
@@ -656,6 +660,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
     \class QMediaServiceSupportedDevicesInterface
     \brief The QMediaServiceSupportedDevicesInterface class interface
     identifies the devices supported by a media service plug-in.
+    \since 4.7
 
     A QMediaServiceProviderPlugin may implement this interface.
 */
@@ -682,6 +687,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
     \class QMediaServiceFeaturesInterface
     \brief The QMediaServiceFeaturesInterface class interface identifies
     features supported by a media service plug-in.
+    \since 4.7
 
     A QMediaServiceProviderPlugin may implement this interface.
 */
diff --git a/src/multimedia/base/qmediatimerange.cpp b/src/multimedia/base/qmediatimerange.cpp
index 0ca1948..e1cea7e 100644
--- a/src/multimedia/base/qmediatimerange.cpp
+++ b/src/multimedia/base/qmediatimerange.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     \class QMediaTimeInterval
     \brief The QMediaTimeInterval class represents a time interval with integer precision.
     \ingroup multimedia
+    \since 4.7
 
     An interval is specified by an inclusive start() and end() time.
     These must be set in the constructor, as this is an immutable class.
@@ -308,6 +309,7 @@ void QMediaTimeRangePrivate::removeInterval(const QMediaTimeInterval &interval)
     \brief The QMediaTimeRange class represents a set of zero or more disjoint
     time intervals.
     \ingroup multimedia
+    \since 4.7
 
     \reentrant
 
diff --git a/src/multimedia/base/qmetadatacontrol.cpp b/src/multimedia/base/qmetadatacontrol.cpp
index 3ecbe8d..28a82ec 100644
--- a/src/multimedia/base/qmetadatacontrol.cpp
+++ b/src/multimedia/base/qmetadatacontrol.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QMetaDataControl
     \ingroup multimedia-serv
-
+    \since 4.7
     \preliminary
     \brief The QMetaDataControl class provides access to the meta-data of a
     QMediaService's media.
diff --git a/src/multimedia/base/qvideodevicecontrol.cpp b/src/multimedia/base/qvideodevicecontrol.cpp
index 21db500..c0fe9a8 100644
--- a/src/multimedia/base/qvideodevicecontrol.cpp
+++ b/src/multimedia/base/qvideodevicecontrol.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoDeviceControl
     \preliminary
+    \since 4.7
     \brief The QVideoDeviceControl class provides an video device selector media control.
     \ingroup multimedia-serv
 
diff --git a/src/multimedia/base/qvideooutputcontrol.cpp b/src/multimedia/base/qvideooutputcontrol.cpp
index a904385..58f1527 100644
--- a/src/multimedia/base/qvideooutputcontrol.cpp
+++ b/src/multimedia/base/qvideooutputcontrol.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoOutputControl
     \preliminary
-
+    \since 4.7
     \brief The QVideoOutputControl class provides a means of selecting the
     active video output control.
 
diff --git a/src/multimedia/base/qvideorenderercontrol.cpp b/src/multimedia/base/qvideorenderercontrol.cpp
index 4e7b3da..a34ef9b 100644
--- a/src/multimedia/base/qvideorenderercontrol.cpp
+++ b/src/multimedia/base/qvideorenderercontrol.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoRendererControl
     \preliminary
-
+    \since 4.7
     \brief The QVideoRendererControl class provides a control for rendering
     to a video surface.
 
diff --git a/src/multimedia/base/qvideowidget.cpp b/src/multimedia/base/qvideowidget.cpp
index 5df245e..aabfefc 100644
--- a/src/multimedia/base/qvideowidget.cpp
+++ b/src/multimedia/base/qvideowidget.cpp
@@ -488,7 +488,7 @@ void QVideoWidgetPrivate::_q_dimensionsChanged()
 /*!
     \class QVideoWidget
     \preliminary
-
+    \since 4.7
     \brief The QVideoWidget class provides a widget which presents video
     produced by a media object.
     \ingroup multimedia
diff --git a/src/multimedia/base/qvideowidgetcontrol.cpp b/src/multimedia/base/qvideowidgetcontrol.cpp
index bd7ce4e..c53c77b 100644
--- a/src/multimedia/base/qvideowidgetcontrol.cpp
+++ b/src/multimedia/base/qvideowidgetcontrol.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoWidgetControl
     \preliminary
-
+    \since 4.7
     \brief The QVideoWidgetControl class provides a media control which
     implements a video widget.
 
diff --git a/src/multimedia/base/qvideowindowcontrol.cpp b/src/multimedia/base/qvideowindowcontrol.cpp
index a23cb4b..da46823 100644
--- a/src/multimedia/base/qvideowindowcontrol.cpp
+++ b/src/multimedia/base/qvideowindowcontrol.cpp
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QVideoWindowControl
     \preliminary
+    \since 4.7
     \ingroup multimedia-serv
     \brief The QVideoWindowControl class provides a media control for rendering video to a window.