diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-24 10:58:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 11:47:54 +0200 |
| commit | 5ae3adcfa9249fa6a9a9f8d2849dc3a749828481 (patch) | |
| tree | db43904bc83b5c7f6dc8fe80c674591861e63ef2 /examples | |
| parent | e2f5779d2a918942d61e4ebf2acdc2ae5a97b5de (diff) | |
Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.
Remove QDeclarative compatibility module code.
Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'examples')
7 files changed, 9 insertions, 9 deletions
diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index f1599741d..6ca62f0f9 100644 --- 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 diff --git a/examples/declarative-radio/main.cpp b/examples/declarative-radio/main.cpp index 442916edb..40aca8923 100644 --- 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> diff --git a/examples/video/qmlvideo/main.cpp b/examples/video/qmlvideo/main.cpp index 495dc0299..3653f62e3 100644 --- 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" diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp index 40d140f56..a124133ea 100644 --- 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 diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri index fb7414df0..591649357 100644 --- 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 diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp b/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp index 82600680b..0c48426bf 100644 --- 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() { diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri index 277869202..e6ab817b3 100644 --- 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) { |