sfos/ttrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[harmattan] using 'viewer->engine()->setNetworkAccessManagerFactory' instead of self-defined 'viewer->setNetworkAccessManagerFactory' and thereby reverting the qmlapplicationviewer to the default

Browse source
This commit is contained in:
Hauke Schade 2014-04-03 13:33:40 +02:00
parent d06dfb84bf
commit 18bab7f0ce
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.cpp
View file

@ -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);

4
qmlapplicationviewer/qmlapplicationviewer.cpp
View file

@ -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)

2
qmlapplicationviewer/qmlapplicationviewer.h
View file

@ -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);