Merge "Merge branch 'release' into stable" into refs/staging/stable

6 files changed, 44 insertions, 9 deletions

diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index cc5a6704b..84935ada5 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -1,5 +1,11 @@
 Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
-compatibility (source and binary) with Qt 5.0.0.
+source compatibility with Qt 5.0.0.
+
+However, to fix a bug we detected after the 5.0 release, this release
+has a limited binary compatibility break. We therefore recommend all
+users to recompile their applications that provided QtMultimedia
+plugins or dealt with them directly. This is an exceptional case:
+compatibility will be kept for further releases.
 
 For more details, refer to the online documentation included in this
 distribution. The documentation is also available online:
@@ -22,6 +28,16 @@ information about a particular change.
 General Improvements
 --------------------
 
+ * Documentation: Various documentation fixes such as spelling and
+   snippet corrections.
+
+ * Fixed an issue that could cause memory leak when certain objects
+   were destroyed. The fix for this issue required a binary
+   compatibility break in two classes: QAudioSystemFactoryInterface
+   and QMediaServiceProviderFactoryInterface. Those two classes are
+   used only in QtMultimedia plugins and code directly dealing with
+   them and recompilation is only strictly necessary for them.
+
 Third party components
 ----------------------
 
@@ -29,6 +45,21 @@ Third party components
 *                          Library                                         *
 ****************************************************************************
 
+ - WMF: added more metadata keys (on Windows 7 and later).
+ - Compile in 32-bit mode.
+ - remove leftover code from multimediawidgets carve-out
+ - WMF: release video controls before releasing the session
+ - WMF: Fixed uninitialized member variable.
+ - WMF: re-enabled video probes and made it more robust.
+ - [QTBUG-28376] Make QtMultimedia an identified module
+ - [QTBUG-28727] Doc: Moved the qdocinc and image to the sourcedirs
+ - Remove comma at the end of the enum
+ - fix include statements
+ - Use qrc to deploy qml files in declarative-camera examples
+ - [QTBUG-26621] WMF: Fixed incorrect QMediaPlayer volume reporting.
+ - Polish and fix qmlvideofx example
+ - Add qmake generated files to .gitignore.
+ - Example: Notify user of errors
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
@@ -41,11 +72,5 @@ Third party components
 
 
 ****************************************************************************
-*                          Tools                                           *
-****************************************************************************
-
-
-****************************************************************************
 *                          Plugins                                         *
 ****************************************************************************
-
diff --git a/src/multimedia/audio/qaudiosystemplugin.cpp b/src/multimedia/audio/qaudiosystemplugin.cpp
index 0197cf722..6a590e976 100644
--- a/src/multimedia/audio/qaudiosystemplugin.cpp
+++ b/src/multimedia/audio/qaudiosystemplugin.cpp
@@ -44,6 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
+QAudioSystemFactoryInterface::~QAudioSystemFactoryInterface()
+{
+}
+
 /*!
     \class QAudioSystemPlugin
     \brief The QAudioSystemPlugin class provides an abstract base for audio plugins.
diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h
index e236455e5..a440963b4 100644
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -66,6 +66,7 @@ struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface
     virtual QAbstractAudioInput* createInput(const QByteArray& device) = 0;
     virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = 0;
     virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) = 0;
+    virtual ~QAudioSystemFactoryInterface();
 };
 
 #define QAudioSystemFactoryInterface_iid \
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index 3873bd25c..7f11dcabe 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -14,7 +14,7 @@ version                 = 5.0.1
 # format.
 qhp.projects = qtmultimedia
 qhp.qtmultimedia.file = qtmultimedia.qhp
-qhp.qtmultimedia.namespace = org.qt-project.qtmultimedia.500
+qhp.qtmultimedia.namespace = org.qt-project.qtmultimedia.501
 qhp.qtmultimedia.indexTitle = Qt Multimedia
 qhp.qtmultimedia.virtualFolder  = qtmultimedia
 
@@ -26,7 +26,7 @@ qhp.qtmultimedia.subprojects.classes.selectors = class fake:headerfile
 qhp.qtmultimedia.subprojects.classes.sortPages = true
 qhp.qtmultimedia.subprojects.qmltypes.title = QML Types
 qhp.qtmultimedia.subprojects.qmltypes.indexTitle = Qt Multimedia QML Types
-qhp.qtmultimedia.subprojects.qmltypes.selectors = class fake:headerfile
+qhp.qtmultimedia.subprojects.qmltypes.selectors = fake:qmlclass
 qhp.qtmultimedia.subprojects.qmltypes.sortPages = true
 
 exampledirs += ../../../examples \
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 2b27f2193..0f5ff2b97 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -50,6 +50,10 @@
 
 QT_BEGIN_NAMESPACE
 
+QMediaServiceProviderFactoryInterface::~QMediaServiceProviderFactoryInterface()
+{
+}
+
 class QMediaServiceProviderHintPrivate : public QSharedData
 {
 public:
diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h
index 371271a05..628e0f8f9 100644
--- a/src/multimedia/qmediaserviceproviderplugin.h
+++ b/src/multimedia/qmediaserviceproviderplugin.h
@@ -112,6 +112,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface
 {
     virtual QMediaService* create(QString const& key) = 0;
     virtual void release(QMediaService *service) = 0;
+    virtual ~QMediaServiceProviderFactoryInterface();
 };
 
 #define QMediaServiceProviderFactoryInterface_iid \