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

Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.

Browse Source 
Remove QDeclarative compatibility module code.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-24 10:58:04 +02:00
committed by Qt by Nokia
parent e2f5779d2a
commit 5ae3adcfa9
15 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/imports/audioengine/qdeclarative_sound_p.cpp
View File

@@ -360,9 +360,9 @@ void QDeclarativeSound::setCategoryObject(QDeclarativeAudioCategory *categoryObj
m_categoryObject = categoryObject;
}
QDeclarativeListProperty<QDeclarativePlayVariation> QDeclarativeSound::playVariationlist()
QQmlListProperty<QDeclarativePlayVariation> QDeclarativeSound::playVariationlist()
{
return QDeclarativeListProperty<QDeclarativePlayVariation>(this, 0, appendFunction);
return QQmlListProperty<QDeclarativePlayVariation>(this, 0, appendFunction);
}
QList<QDeclarativePlayVariation*>& QDeclarativeSound::playlist()
@@ -370,7 +370,7 @@ QList<QDeclarativePlayVariation*>& QDeclarativeSound::playlist()
return m_playlist;
}
void QDeclarativeSound::appendFunction(QDeclarativeListProperty<QDeclarativePlayVariation> *property, QDeclarativePlayVariation *value)
void QDeclarativeSound::appendFunction(QQmlListProperty<QDeclarativePlayVariation> *property, QDeclarativePlayVariation *value)
{
QDeclarativeSound *sound = static_cast<QDeclarativeSound*>(property->object);
if (sound->m_complete) {