diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-10 15:57:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-14 05:34:32 +0200 |
| commit | 68680fc6613da4459591354e496581ece63911bf (patch) | |
| tree | 75463aecadeb779fd5ce0962058195cdf8439e50 /examples | |
| parent | da12ea2e80553a6419b3da2c7eb54f754e24c730 (diff) | |
Don't use QtDeclarative compat module
Use QtQml instead.
Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative-camera/qmlcamera.cpp | 6 | ||||
| -rw-r--r-- | examples/examples.pro | 2 | ||||
| -rw-r--r-- | examples/video/qmlvideofx/main.cpp | 2 | ||||
| -rw-r--r-- | examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp index cb5d95c3f..85bd9c9d2 100644 --- a/examples/declarative-camera/qmlcamera.cpp +++ b/examples/declarative-camera/qmlcamera.cpp @@ -41,7 +41,7 @@ #include <QtWidgets/QApplication> #include <QtWidgets/QDesktopWidget> #include <QtQuick1/qdeclarativeview.h> -#include <QtDeclarative/QDeclarativeEngine> +#include <QtQml/QQmlEngine> #if !defined(QT_NO_OPENGL) #include <QtOpenGL/QGLWidget> @@ -67,12 +67,12 @@ int main(int argc, char *argv[]) QApplication application(argc, argv); const QString mainQmlApp = QLatin1String("qrc:/declarative-camera.qml"); - QDeclarativeView view; + QQuickView view; #if !defined(QT_NO_OPENGL) view.setViewport(new QGLWidget); #endif view.setSource(QUrl(mainQmlApp)); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); + view.setResizeMode(QQuickView::SizeRootObjectToView); // Qt.quit() called in embedded .qml by default only emits // quit() signal, so do this (optionally use Qt.exit()). QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); diff --git a/examples/examples.pro b/examples/examples.pro index 60fc9c433..a98c082e3 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -15,7 +15,7 @@ TEMPLATE = subdirs videowidget \ player - contains(QT_CONFIG, declarative) { + contains(QT_CONFIG, qml) { disabled:SUBDIRS += declarative-camera SUBDIRS += \ declarative-radio \ diff --git a/examples/video/qmlvideofx/main.cpp b/examples/video/qmlvideofx/main.cpp index 02568dfbe..46c25a739 100644 --- a/examples/video/qmlvideofx/main.cpp +++ b/examples/video/qmlvideofx/main.cpp @@ -41,7 +41,7 @@ #include <QtCore/QStandardPaths> #include <QtCore/QStringList> -#include <QtDeclarative/QDeclarativeContext> +#include <QtQml/QQmlContext> #include <QtGui/QGuiApplication> #include <QtQuick/QQuickItem> #include "filereader.h" diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp index bcefca846..cc594ee60 100644 --- a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -43,9 +43,9 @@ #include <QtCore/QDir> #include <QtCore/QFileInfo> -#include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> +#include <QtQml/QQmlComponent> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlContext> #include <QtGui/QGuiApplication> class QmlApplicationViewerPrivate |