slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release' into stable

Browse Source 
Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
This commit is contained in:
Sergio Ahumada
2013-01-29 15:21:05 +01:00
parent 28ee5b12ff 1f2427642d
commit c96d152e33
6 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/audio/qaudiosystemplugin.cpp
View File

@@ -44,6 +44,10 @@
QT_BEGIN_NAMESPACE
QAudioSystemFactoryInterface::~QAudioSystemFactoryInterface()
{
}
/*!
\class QAudioSystemPlugin
\brief The QAudioSystemPlugin class provides an abstract base for audio plugins.

1
src/multimedia/audio/qaudiosystemplugin.h
View File

@@ -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 \

4
src/multimedia/doc/qtmultimedia.qdocconf
View File

@@ -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 \

4
src/multimedia/qmediaserviceprovider.cpp
View File

@@ -50,6 +50,10 @@
QT_BEGIN_NAMESPACE
QMediaServiceProviderFactoryInterface::~QMediaServiceProviderFactoryInterface()
{
}
class QMediaServiceProviderHintPrivate : public QSharedData
{
public:

1
src/multimedia/qmediaserviceproviderplugin.h
View File

@@ -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 \