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

4
examples/declarative-radio/main.cpp
View File

@@ -41,14 +41,14 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <qdeclarative.h> #include <qdeclarative.h>
#include <qsgview.h> #include <qquickview.h>
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
QSGView view; QQuickView view;
view.setSource(QUrl("qrc:view.qml")); view.setSource(QUrl("qrc:view.qml"));
view.show(); view.show();

6
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -44,7 +44,7 @@
#include "qsgvideonode_i420.h" #include "qsgvideonode_i420.h"
#include "qsgvideonode_rgb.h" #include "qsgvideonode_rgb.h"
#include <QtDeclarative/qsgitem.h> #include <QtDeclarative/qquickitem.h>
#include <QtMultimedia/QAbstractVideoSurface> #include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaservice.h>
@@ -151,8 +151,8 @@ private:
\brief The QDeclarativeVideoOutput class provides a video output item. \brief The QDeclarativeVideoOutput class provides a video output item.
*/ */
QDeclarativeVideoOutput::QDeclarativeVideoOutput(QSGItem *parent) : QDeclarativeVideoOutput::QDeclarativeVideoOutput(QQuickItem *parent) :
QSGItem(parent), QQuickItem(parent),
m_fillMode(PreserveAspectFit) m_fillMode(PreserveAspectFit)
{ {
setFlag(ItemHasContents, true); setFlag(ItemHasContents, true);

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

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