diff --git a/examples/declarative-radio/main.cpp b/examples/declarative-radio/main.cpp index 81564250..c8cba7b6 100644 --- a/examples/declarative-radio/main.cpp +++ b/examples/declarative-radio/main.cpp @@ -41,14 +41,14 @@ #include #include -#include +#include int main(int argc, char ** argv) { QGuiApplication app(argc, argv); - QSGView view; + QQuickView view; view.setSource(QUrl("qrc:view.qml")); view.show(); diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index 9bd5eb35..2371fdb9 100644 --- a/src/imports/multimedia/qdeclarativevideooutput.cpp +++ b/src/imports/multimedia/qdeclarativevideooutput.cpp @@ -44,7 +44,7 @@ #include "qsgvideonode_i420.h" #include "qsgvideonode_rgb.h" -#include +#include #include #include @@ -151,8 +151,8 @@ private: \brief The QDeclarativeVideoOutput class provides a video output item. */ -QDeclarativeVideoOutput::QDeclarativeVideoOutput(QSGItem *parent) : - QSGItem(parent), +QDeclarativeVideoOutput::QDeclarativeVideoOutput(QQuickItem *parent) : + QQuickItem(parent), m_fillMode(PreserveAspectFit) { setFlag(ItemHasContents, true); diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h index 9286fec8..80170f17 100644 --- a/src/imports/multimedia/qdeclarativevideooutput_p.h +++ b/src/imports/multimedia/qdeclarativevideooutput_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEVIDEOOUTPUT_P_H #define QDECLARATIVEVIDEOOUTPUT_P_H -#include +#include #include #include @@ -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(); }