aboutsummaryrefslogtreecommitdiffstats
path: root/examples/embedded/qmlcalculator
diff options
context:
space:
mode:
Diffstat (limited to 'examples/embedded/qmlcalculator')
-rw-r--r--examples/embedded/qmlcalculator/deployment.pri2
-rw-r--r--examples/embedded/qmlcalculator/qmlcalculator.cpp8
-rw-r--r--examples/embedded/qmlcalculator/qmlcalculator.pro2
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri
index a3627b8fa2..4286bb6e24 100644
--- a/examples/embedded/qmlcalculator/deployment.pri
+++ b/examples/embedded/qmlcalculator/deployment.pri
@@ -1,4 +1,4 @@
-qmlcalculator_src = $$PWD/../../declarative/calculator
+qmlcalculator_src = $$PWD/../../qml/calculator
qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core
DEPLOYMENT += qmlcalculator_files
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp
index 4be7bc462d..17bf0f14f2 100644
--- a/examples/embedded/qmlcalculator/qmlcalculator.cpp
+++ b/examples/embedded/qmlcalculator/qmlcalculator.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("calculator.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/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro
index 25c16ca78a..4ebf2d5972 100644
--- a/examples/embedded/qmlcalculator/qmlcalculator.pro
+++ b/examples/embedded/qmlcalculator/qmlcalculator.pro
@@ -1,5 +1,5 @@
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-QT += declarative
+QT += qml
SOURCES += $$PWD/qmlcalculator.cpp
include($$PWD/deployment.pri)