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

Updated declarative components to use the QML module

Browse Source 
Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Jonas Rabbe
2012-03-14 08:39:43 +10:00
committed by Qt by Nokia
parent 8d63785425
commit 8e82f57c6a
31 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/imports/multimedia/qdeclarativeaudio_p_4.h
View File

@@ -54,8 +54,8 @@
//
#include <QtCore/qbasictimer.h>
#include <QtDeclarative/qdeclarativeparserstatus.h>
#include <QtDeclarative/qdeclarative.h>
#include <QtQml/qqmlparserstatus.h>
#include <QtQml/qqml.h>
#include "qdeclarativemediabase_p_4.h"
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
class QTimerEvent;
class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QDeclarativeParserStatus
class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, public QQmlParserStatus
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -90,7 +90,7 @@ class QDeclarativeAudio_4 : public QObject, public QDeclarativeMediaBase_4, publ
Q_ENUMS(Status)
Q_ENUMS(Error)
Q_ENUMS(Loop)
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
public:
enum Status
{