Merge branch 'release' into stable

Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
2013-01-29 15:21:05 +01:00
parent 28ee5b12ff 1f2427642d
commit c96d152e33
6 changed files with 44 additions and 9 deletions
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -50,6 +50,10 @@

 QT_BEGIN_NAMESPACE

+QMediaServiceProviderFactoryInterface::~QMediaServiceProviderFactoryInterface()
+{
+}
+
 class QMediaServiceProviderHintPrivate : public QSharedData
 {
 public: