aboutsummaryrefslogtreecommitdiffstats
path: root/examples/embedded/qmlflickr
diff options
context:
space:
mode:
Diffstat (limited to 'examples/embedded/qmlflickr')
-rw-r--r--examples/embedded/qmlflickr/deployment.pri2
-rw-r--r--examples/embedded/qmlflickr/qmlflickr.cpp14
-rw-r--r--examples/embedded/qmlflickr/qmlflickr.pro2
3 files changed, 9 insertions, 9 deletions
diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri
index 0d76ddc1db..7b9b62b459 100644
--- a/examples/embedded/qmlflickr/deployment.pri
+++ b/examples/embedded/qmlflickr/deployment.pri
@@ -1,4 +1,4 @@
-qmlflickr_src = $$PWD/../../declarative/flickr
+qmlflickr_src = $$PWD/../../qml/flickr
qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile
DEPLOYMENT += qmlflickr_files
diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp
index 93b28f7cec..268542e61b 100644
--- a/examples/embedded/qmlflickr/qmlflickr.cpp
+++ b/examples/embedded/qmlflickr/qmlflickr.cpp
@@ -42,17 +42,17 @@
#include <QtCore/QFileInfo>
#include <QtCore/QSettings>
#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlNetworkAccessManagerFactory>
#include <QtNetwork/QNetworkConfiguration>
#include <QtNetwork/QNetworkConfigurationManager>
#include <QtNetwork/QNetworkAccessManager>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlEngine>
// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
{
public:
~NetworkAccessManagerFactory() { }
@@ -92,10 +92,10 @@ int main(int argc, char *argv[])
NetworkAccessManagerFactory networkAccessManagerFactory;
const QString mainQmlApp = QLatin1String("flickr.qml");
- QDeclarativeView view;
+ QQuickView view;
view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
view.setSource(QUrl(mainQmlApp));
- view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+ view.setResizeMode(QQuickView::SizeRootObjectToView);
QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
view.setGeometry(QRect(100, 100, 360, 640));
view.show();
diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro
index 869d651b05..141c02d3fe 100644
--- a/examples/embedded/qmlflickr/qmlflickr.pro
+++ b/examples/embedded/qmlflickr/qmlflickr.pro
@@ -1,5 +1,5 @@
!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-QT += declarative network
+QT += qml network
SOURCES += $$PWD/qmlflickr.cpp
include($$PWD/deployment.pri)