From 18bab7f0ce2ddf40e2059212e4220731e7c2a7bc Mon Sep 17 00:00:00 2001
From: Hauke Schade <cnlpete@cnlpete.de>
Date: Thu, 3 Apr 2014 13:33:40 +0200
Subject: [PATCH] [harmattan] using
 'viewer->engine()->setNetworkAccessManagerFactory' instead of self-defined
 'viewer->setNetworkAccessManagerFactory' and thereby reverting the
 qmlapplicationviewer to the default

---
 main.cpp                                      | 4 ++--
 qmlapplicationviewer/qmlapplicationviewer.cpp | 4 ----
 qmlapplicationviewer/qmlapplicationviewer.h   | 2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/main.cpp b/main.cpp
index e6b563c..aae9d9e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,6 +19,7 @@
     #include <QtGui/QApplication>
     #include <QtDeclarative/QDeclarativeContext>
     #include "qmlapplicationviewer.h"
+    #include <QDeclarativeEngine>
 #endif
 
 #include <QTranslator>
@@ -55,14 +56,13 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
 #if defined(Q_OS_SAILFISH)
     QQuickView* viewer = SailfishApp::createView();
-    viewer->engine()->setNetworkAccessManagerFactory(MyNetworkManager::instance());
 #else
     QmlApplicationViewer *viewer = new QmlApplicationViewer();
     viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
 
     //QObject::connect(viewer.engine(), SIGNAL(quit()), viewer.data, SLOT(close()));
-    viewer->setNetworkAccessManagerFactory(MyNetworkManager::instance());
 #endif
+    viewer->engine()->setNetworkAccessManagerFactory(MyNetworkManager::instance());
     viewer->rootContext()->setContextProperty("network", MyNetworkManager::instance());
 
     viewer->rootContext()->setContextProperty("APP_VERSION", APP_VERSION);
diff --git a/qmlapplicationviewer/qmlapplicationviewer.cpp b/qmlapplicationviewer/qmlapplicationviewer.cpp
index 05e3d9f..997bbfc 100644
--- a/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -153,10 +153,6 @@ void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
     setAttribute(attribute, true);
 }
 
-void QmlApplicationViewer::setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *networkfactory) {
-    engine()->setNetworkAccessManagerFactory(networkfactory);
-}
-
 void QmlApplicationViewer::showExpanded()
 {
 #if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
diff --git a/qmlapplicationviewer/qmlapplicationviewer.h b/qmlapplicationviewer/qmlapplicationviewer.h
index 2215e9c..b01cc88 100644
--- a/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/qmlapplicationviewer/qmlapplicationviewer.h
@@ -12,7 +12,6 @@
 #define QMLAPPLICATIONVIEWER_H
 
 #include <QtDeclarative/QDeclarativeView>
-#include <qdeclarativenetworkaccessmanagerfactory.h>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
@@ -32,7 +31,6 @@ public:
 
     void setMainQmlFile(const QString &file);
     void addImportPath(const QString &path);
-    void setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *networkfactory);
 
     // Note that this will only have an effect on Symbian and Fremantle.
     void setOrientation(ScreenOrientation orientation);