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

Don't use QtDeclarative compat module

Browse Source 
Use QtQml instead.

Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Kent Hansen
2012-05-10 15:57:06 +02:00
committed by Qt by Nokia
parent da12ea2e80
commit 68680fc661
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/declarative-camera/qmlcamera.cpp
View File

@@ -41,7 +41,7 @@
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtWidgets/QDesktopWidget> #include <QtWidgets/QDesktopWidget>
#include <QtQuick1/qdeclarativeview.h> #include <QtQuick1/qdeclarativeview.h>
#include <QtDeclarative/QDeclarativeEngine> #include <QtQml/QQmlEngine>
#if !defined(QT_NO_OPENGL) #if !defined(QT_NO_OPENGL)
#include <QtOpenGL/QGLWidget> #include <QtOpenGL/QGLWidget>
@@ -67,12 +67,12 @@ int main(int argc, char *argv[])
QApplication application(argc, argv); QApplication application(argc, argv);
const QString mainQmlApp = QLatin1String("qrc:/declarative-camera.qml"); const QString mainQmlApp = QLatin1String("qrc:/declarative-camera.qml");
QDeclarativeView view; QQuickView view;
#if !defined(QT_NO_OPENGL) #if !defined(QT_NO_OPENGL)
view.setViewport(new QGLWidget); view.setViewport(new QGLWidget);
#endif #endif
view.setSource(QUrl(mainQmlApp)); view.setSource(QUrl(mainQmlApp));
view.setResizeMode(QDeclarativeView::SizeRootObjectToView); view.setResizeMode(QQuickView::SizeRootObjectToView);
// Qt.quit() called in embedded .qml by default only emits // Qt.quit() called in embedded .qml by default only emits
// quit() signal, so do this (optionally use Qt.exit()). // quit() signal, so do this (optionally use Qt.exit()).
QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));

2
examples/examples.pro
View File

@@ -15,7 +15,7 @@ TEMPLATE = subdirs
videowidget \ videowidget \
player player
contains(QT_CONFIG, declarative) { contains(QT_CONFIG, qml) {
disabled:SUBDIRS += declarative-camera disabled:SUBDIRS += declarative-camera
SUBDIRS += \ SUBDIRS += \
declarative-radio \ declarative-radio \

2
examples/video/qmlvideofx/main.cpp
View File

@@ -41,7 +41,7 @@
#include <QtCore/QStandardPaths> #include <QtCore/QStandardPaths>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtDeclarative/QDeclarativeContext> #include <QtQml/QQmlContext>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtQuick/QQuickItem> #include <QtQuick/QQuickItem>
#include "filereader.h" #include "filereader.h"

6
examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -43,9 +43,9 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtDeclarative/QDeclarativeComponent> #include <QtQml/QQmlComponent>
#include <QtDeclarative/QDeclarativeEngine> #include <QtQml/QQmlEngine>
#include <QtDeclarative/QDeclarativeContext> #include <QtQml/QQmlContext>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
class QmlApplicationViewerPrivate class QmlApplicationViewerPrivate

2
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -154,7 +154,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\internal \internal
\class QDeclarativeAudio \class QDeclarativeAudio
\brief The QDeclarativeAudio class provides an audio item that you can add to a QDeclarativeView. \brief The QDeclarativeAudio class provides an audio item that you can add to a QQuickView.
*/ */
void QDeclarativeAudio::_q_error(QMediaPlayer::Error errorCode) void QDeclarativeAudio::_q_error(QMediaPlayer::Error errorCode)

2
src/imports/multimedia/qdeclarativeaudio_4.cpp
View File

@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
/* /*
\internal \internal
\class QDeclarativeAudio \class QDeclarativeAudio
\brief The QDeclarativeAudio class provides an audio item that you can add to a QDeclarativeView. \brief The QDeclarativeAudio class provides an audio item that you can add to a QQuickView.
*/ */
void QDeclarativeAudio_4::_q_error(int errorCode, const QString &errorString) void QDeclarativeAudio_4::_q_error(int errorCode, const QString &errorString)

2
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -162,7 +162,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError
/*! /*!
\class QDeclarativeCamera \class QDeclarativeCamera
\internal \internal
\brief The QDeclarativeCamera class provides a camera item that you can add to a QDeclarativeView. \brief The QDeclarativeCamera class provides a camera item that you can add to a QQuickView.
*/ */
/*! /*!