From 68680fc6613da4459591354e496581ece63911bf Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Thu, 10 May 2012 15:57:06 +0200
Subject: Don't use QtDeclarative compat module

Use QtQml instead.

Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
---
 examples/declarative-camera/qmlcamera.cpp                           | 6 +++---
 examples/examples.pro                                               | 2 +-
 examples/video/qmlvideofx/main.cpp                                  | 2 +-
 .../video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp  | 6 +++---
 src/imports/multimedia/qdeclarativeaudio.cpp                        | 2 +-
 src/imports/multimedia/qdeclarativeaudio_4.cpp                      | 2 +-
 src/imports/multimedia/qdeclarativecamera.cpp                       | 2 +-
 7 files changed, 11 insertions(+), 11 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
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index d9b229b73..c124c2412 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -154,7 +154,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \internal
     \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)
diff --git a/src/imports/multimedia/qdeclarativeaudio_4.cpp b/src/imports/multimedia/qdeclarativeaudio_4.cpp
index d157cf7ad..bf03e1d66 100644
--- a/src/imports/multimedia/qdeclarativeaudio_4.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio_4.cpp
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
 /*
     \internal
     \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)
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index d20f2e9b5..d00c9d70a 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -162,7 +162,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError
 /*!
     \class QDeclarativeCamera
     \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.
 */
 
 /*!
-- 
cgit v1.2.3