diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudiosystemplugin.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiosystemplugin.h | 1 | ||||
| -rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 4 | ||||
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/qmediaserviceproviderplugin.h | 1 |
5 files changed, 12 insertions, 2 deletions
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 \ |