Merge remote branch 'qt/master' into qml-master

Conflicts:
	tools/qdoc3/cppcodeparser.cpp
	tools/qdoc3/htmlgenerator.cpp
	tools/qdoc3/htmlgenerator.h
	tools/qdoc3/node.cpp

1 files changed, 6 insertions, 0 deletions

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