diff options
Diffstat (limited to 'examples/embedded/qmleasing')
| -rw-r--r-- | examples/embedded/qmleasing/deployment.pri | 2 | ||||
| -rw-r--r-- | examples/embedded/qmleasing/qmleasing.cpp | 8 | ||||
| -rw-r--r-- | examples/embedded/qmleasing/qmleasing.pro | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri index 7a5d0401cb..427259b816 100644 --- a/examples/embedded/qmleasing/deployment.pri +++ b/examples/embedded/qmleasing/deployment.pri @@ -1,4 +1,4 @@ -qmleasing_src = $$PWD/../../../examples/declarative/animation/easing +qmleasing_src = $$PWD/../../../examples/qml/animation/easing qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content DEPLOYMENT += qmleasing_files diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp index 8220e03cff..d516825d9a 100644 --- a/examples/embedded/qmleasing/qmleasing.cpp +++ b/examples/embedded/qmleasing/qmleasing.cpp @@ -41,17 +41,17 @@ #include <QtCore/QFileInfo> #include <QtWidgets/QApplication> -#include <QtDeclarative/QDeclarativeView> -#include <QtDeclarative/QDeclarativeEngine> +#include <QtQuick/QQuickView> +#include <QtQml/QQmlEngine> int main(int argc, char *argv[]) { QApplication application(argc, argv); const QString mainQmlApp = QLatin1String("easing.qml"); - QDeclarativeView view; + QQuickView view; view.setSource(QUrl(mainQmlApp)); - view.setResizeMode(QDeclarativeView::SizeRootObjectToView); + view.setResizeMode(QQuickView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); #if defined(QT_KEYPAD_NAVIGATION) diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro index c9f008d42e..6e0383502b 100644 --- a/examples/embedded/qmleasing/qmleasing.pro +++ b/examples/embedded/qmleasing/qmleasing.pro @@ -1,5 +1,5 @@ !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") -QT += declarative +QT += qml SOURCES += $$PWD/qmleasing.cpp include($$PWD/deployment.pri) |