diff options
Diffstat (limited to 'examples/embedded/qmlphotoviewer')
| -rw-r--r-- | examples/embedded/qmlphotoviewer/deployment.pri | 2 | ||||
| -rw-r--r-- | examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp | 12 | ||||
| -rw-r--r-- | examples/embedded/qmlphotoviewer/qmlphotoviewer.pro | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri index 504373914a..ea9a052b4b 100644 --- a/examples/embedded/qmlphotoviewer/deployment.pri +++ b/examples/embedded/qmlphotoviewer/deployment.pri @@ -1,4 +1,4 @@ -qmlphotoviewer_src = $$PWD/../../declarative/photoviewer +qmlphotoviewer_src = $$PWD/../../qml/photoviewer qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore DEPLOYMENT += qmlphotoviewer_files diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp index 32c9d24eaa..18bf1ae094 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp @@ -42,16 +42,16 @@ #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> // Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise // the system default. -class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory +class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory { public: ~NetworkAccessManagerFactory() { } @@ -91,10 +91,10 @@ int main(int argc, char *argv[]) NetworkAccessManagerFactory networkAccessManagerFactory; const QString mainQmlApp = QLatin1String("photoviewer.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)); diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro index 9941b2e226..1c0301118e 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro @@ -1,5 +1,5 @@ !wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") -QT += declarative network +QT += qml network SOURCES += $$PWD/qmlphotoviewer.cpp include($$PWD/deployment.pri) |