Merge remote branch 'origin/1.1' into master-from-1.1

1 files changed, 2 insertions, 9 deletions

diff --git a/plugins/declarative/multimedia/qdeclarativevideo_p.h b/plugins/declarative/multimedia/qdeclarativevideo_p.h
index d1550692a5..f6ef7d81e4 100644
--- a/plugins/declarative/multimedia/qdeclarativevideo_p.h
+++ b/plugins/declarative/multimedia/qdeclarativevideo_p.h
@@ -89,7 +89,7 @@ class QDeclarativeVideo : public QDeclarativeItem, public QDeclarativeMediaBase
     Q_PROPERTY(Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
     Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode)
-    Q_PROPERTY(QObject *metaData READ metaData CONSTANT)
+    Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT)
     Q_ENUMS(FillMode)
     Q_ENUMS(Status)
     Q_ENUMS(Error)
@@ -138,7 +138,7 @@ public:
 
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
 
-    void classBegin() {}
+    void classBegin();
     void componentComplete();
 
 public Q_SLOTS:
@@ -160,12 +160,6 @@ Q_SIGNALS:
 
     void statusChanged();
 
-    void loaded();
-    void buffering();
-    void stalled();
-    void buffered();
-    void endOfMedia();
-
     void durationChanged();
     void positionChanged();
 
@@ -195,7 +189,6 @@ private:
     QGraphicsVideoItem *m_graphicsItem;
 
     Q_PRIVATE_SLOT(mediaBase(), void _q_statusChanged())
-    Q_PRIVATE_SLOT(mediaBase(), void _q_metaDataChanged())
 
     inline QDeclarativeMediaBase *mediaBase() { return this; }
 };