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

Adapt to QtDeclarative api renaming (QSG --> QQuick)

Browse Source 
Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Kent Hansen
2011-10-20 08:37:39 +02:00
committed by Qt by Nokia
parent df19dfcb56
commit 711f49efea
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/imports/multimedia/qdeclarativevideooutput_p.h
View File

@@ -42,7 +42,7 @@
#ifndef QDECLARATIVEVIDEOOUTPUT_P_H
#define QDECLARATIVEVIDEOOUTPUT_P_H
#include <qsgitem.h>
#include <qquickitem.h>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qmediaobject.h>
@@ -56,7 +56,7 @@ class QVideoRendererControl;
class QMediaService;
class QVideoSurfaceFormat;
class QDeclarativeVideoOutput : public QSGItem
class QDeclarativeVideoOutput : public QQuickItem
{
Q_OBJECT
Q_DISABLE_COPY(QDeclarativeVideoOutput)
@@ -72,7 +72,7 @@ public:
PreserveAspectCrop = Qt::KeepAspectRatioByExpanding
};
QDeclarativeVideoOutput(QSGItem *parent = 0);
QDeclarativeVideoOutput(QQuickItem *parent = 0);
~QDeclarativeVideoOutput();
QObject *source() const { return m_source.data(); }