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

10
src/imports/audioengine/qdeclarative_sound_p.h
View File

@@ -84,18 +84,18 @@ private:
qreal m_outerGain;
};
class QDeclarativeSound : public QObject, public QDeclarativeParserStatus
class QDeclarativeSound : public QObject, public QQmlParserStatus
{
friend class QDeclarativeSoundCone;
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(PlayType playType READ playType WRITE setPlayType)
Q_PROPERTY(QString category READ category WRITE setCategory)
Q_PROPERTY(QDeclarativeSoundCone* cone READ cone CONSTANT)
Q_PROPERTY(QString attenuationModel READ attenuationModel WRITE setAttenuationModel)
Q_PROPERTY(QDeclarativeListProperty<QDeclarativePlayVariation> playVariationlist READ playVariationlist CONSTANT)
Q_PROPERTY(QQmlListProperty<QDeclarativePlayVariation> playVariationlist READ playVariationlist CONSTANT)
Q_CLASSINFO("DefaultProperty", "playVariationlist")
Q_ENUMS(PlayType)
@@ -135,7 +135,7 @@ public:
QDeclarativePlayVariation* getVariation(int index);
//This is used for tracking new PlayVariation declared inside Sound
QDeclarativeListProperty<QDeclarativePlayVariation> playVariationlist();
QQmlListProperty<QDeclarativePlayVariation> playVariationlist();
QList<QDeclarativePlayVariation*>& playlist();
public Q_SLOTS:
@@ -156,7 +156,7 @@ public Q_SLOTS:
private:
Q_DISABLE_COPY(QDeclarativeSound)
QDeclarativeSoundInstance* newInstance(bool managed);
static void appendFunction(QDeclarativeListProperty<QDeclarativePlayVariation> *property, QDeclarativePlayVariation *value);
static void appendFunction(QQmlListProperty<QDeclarativePlayVariation> *property, QDeclarativePlayVariation *value);
bool m_complete;
PlayType m_playType;
QString m_name;