From 687c77d39484ea9bee99a539afa24335425d75ef Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Thu, 1 Mar 2012 07:08:48 +0100
Subject: Compile after Qt5 meta-object changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Qt5 the meta-object stringdata is of type const QByteArrayData *.

This commit keeps Phonon compiling while the custom meta-objects are
ported over to the latest meta-object revision (7).

Support for older revisions (<= 6) will be removed in Qt5.

Change-Id: I50a79f6d1adc56f043da614faee9c99f640cfd72
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
---
 src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
index c1c9f34..613a6bc 100644
--- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
+++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
@@ -68,23 +68,23 @@ namespace Phonon
 {
 
 template<> const QMetaObject ObjectDescriptionModel<AudioOutputDeviceType>::staticMetaObject = {
-    { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType,
+    { &QAbstractListModel::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType),
       qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
 };
 template<> const QMetaObject ObjectDescriptionModel<EffectType>::staticMetaObject = {
-    { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType,
+    { &QAbstractListModel::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_Phonon__ObjectDescriptionModel_EffectType),
       qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
 };
 template<> const QMetaObject ObjectDescriptionModel<AudioChannelType>::staticMetaObject = {
-    { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType,
+    { &QAbstractListModel::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioChannelType),
       qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
 };
 template<> const QMetaObject ObjectDescriptionModel<SubtitleType>::staticMetaObject = {
-    { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType,
+    { &QAbstractListModel::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_Phonon__ObjectDescriptionModel_SubtitleType),
       qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
 };
 template<> const QMetaObject ObjectDescriptionModel<AudioCaptureDeviceType>::staticMetaObject = {
-    { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType,
+    { &QAbstractListModel::staticMetaObject, reinterpret_cast<const QByteArrayData *>(qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioCaptureDeviceType),
       qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
 };
 /*template<> const QMetaObject ObjectDescriptionModel<VideoOutputDeviceType>::staticMetaObject = {
-- 
cgit v1.2.3