summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/phonon
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-19 10:25:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-25 22:49:14 +0200
commit171fc02a556a28257af693459f9eae0bb168a535 (patch)
treea6c3dd91960503cbb8c3e8c0799101c88ab766b3 /src/3rdparty/phonon/phonon
parentcd6fed070da9d86ad2957d3c9d86b55e1ecdfb65 (diff)
Adapt phonon to change in QMetaObject
Changes If0b8f586cbaf633eed10045adee3ba3366826c86 in qtbase. (Note that this change is optional since static memory is already initialized to 0) Change-Id: I403da65a01d12c3f4d7c707ffc3e13f6d5a65121 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/3rdparty/phonon/phonon')
-rw-r--r--src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
index 184296d..89763ea 100644
--- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
+++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
@@ -116,47 +116,47 @@ namespace Phonon
template<> const QMetaObject ObjectDescriptionModel<AudioOutputDeviceType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<EffectType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<AudioChannelType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<SubtitleType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<AudioCaptureDeviceType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
/*template<> const QMetaObject ObjectDescriptionModel<VideoOutputDeviceType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoOutputDeviceType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<VideoCaptureDeviceType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCaptureDeviceType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<AudioCodecType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCodecType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<VideoCodecType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VideoCodecType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<ContainerFormatType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_ContainerFormatType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};
template<> const QMetaObject ObjectDescriptionModel<VisualizationType>::staticMetaObject = {
{ &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_VisualizationType.data,
- qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
+ qt_meta_data_Phonon__ObjectDescriptionModel, 0, 0, 0 }
};*/
template<ObjectDescriptionType type>