Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.

Remove QDeclarative compatibility module code. Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-24 10:58:04 +02:00
parent e2f5779d2a
commit 5ae3adcfa9
15 changed files with 38 additions and 38 deletions
--- a/examples/declarative-camera/declarative-camera.pro
+++ b/examples/declarative-camera/declarative-camera.pro
@@ -1,7 +1,7 @@

 TEMPLATE=app

-QT += declarative qtquick1 network multimedia
+QT += qtquick1 network multimedia

 contains(QT_CONFIG, opengl) {
    QT += opengl
--- a/examples/declarative-radio/main.cpp
+++ b/examples/declarative-radio/main.cpp
@@ -40,7 +40,7 @@

 #include <QGuiApplication>

-#include <qdeclarative.h>
+#include <qqml.h>
 #include <QtQuick/qquickview.h>


--- a/examples/video/qmlvideo/main.cpp
+++ b/examples/video/qmlvideo/main.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/QStandardPaths>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QtQml/QQmlContext>
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickItem>
 #include "qmlapplicationviewer.h"
--- a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/video/qmlvideo/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
--- a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -2,7 +2,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $OTHER_FILES *.pro *.pri
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/$${TARGET}
 INSTALLS += sources

-QT += quick
+QT += qml quick

 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
--- a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
+++ b/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/

 #include "frequencymonitor.h"
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>

 void FrequencyMonitor::qmlRegisterType()
 {
--- a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
+++ b/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
@@ -1,5 +1,5 @@
 include($$PWD/frequencymonitor.pri)
-QT += declarative
+QT += qml
 SOURCES += $$PWD/frequencymonitordeclarative.cpp

 defineTest(frequencyItemAddDeployment) {