added myNetworkManager
This commit is contained in:
Hauke Schade
parent
01c5ee0503
commit
0ac082ae86
6 changed files with 40 additions and 32 deletions
|
|
@ -7,7 +7,7 @@
|
|||
# - desktop filename must be changed
|
||||
# - icon definition filename in desktop file must be changed
|
||||
|
||||
VERSION = 0.3.4
|
||||
VERSION = 0.3.5
|
||||
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
|
||||
|
||||
DEFINES += Q_OS_SAILFISH
|
||||
|
|
@ -46,12 +46,12 @@ RESOURCES += \
|
|||
|
||||
HEADERS += \
|
||||
settings.hh \
|
||||
# mynetworkmanager.hh \
|
||||
mynetworkmanager.hh \
|
||||
qmlutils.hh
|
||||
|
||||
SOURCES += main.cpp \
|
||||
settings.cpp \
|
||||
# mynetworkmanager.cpp \
|
||||
mynetworkmanager.cpp \
|
||||
qmlutils.cpp
|
||||
|
||||
OTHER_FILES += rpm/harbour-ttrss.spec \
|
||||
|
|
|
|||
9
main.cpp
9
main.cpp
|
|
@ -26,11 +26,7 @@
|
|||
|
||||
#include "settings.hh"
|
||||
#include "qmlutils.hh"
|
||||
|
||||
#if defined(Q_OS_SAILFISH)
|
||||
#else
|
||||
#include "mynetworkmanager.hh"
|
||||
#endif
|
||||
#include "mynetworkmanager.hh"
|
||||
|
||||
Q_DECL_EXPORT int main(int argc, char *argv[])
|
||||
{
|
||||
|
|
@ -59,14 +55,15 @@ 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());
|
||||
viewer->rootContext()->setContextProperty("network", MyNetworkManager::instance());
|
||||
#endif
|
||||
viewer->rootContext()->setContextProperty("network", MyNetworkManager::instance());
|
||||
|
||||
viewer->rootContext()->setContextProperty("APP_VERSION", APP_VERSION);
|
||||
|
||||
|
|
|
|||
|
|
@ -32,10 +32,12 @@ QNetworkAccessManager* MyNetworkManager::create(QObject *parent) {
|
|||
connect(nam, SIGNAL(started()), this, SLOT(onStarted()));
|
||||
connect(nam, SIGNAL(error()), this, SLOT(onError()));
|
||||
|
||||
#if !defined(Q_OS_SAILFISH)
|
||||
QNetworkDiskCache* diskCache = new QNetworkDiskCache(parent);
|
||||
diskCache->setCacheDirectory(QDesktopServices::storageLocation(QDesktopServices::CacheLocation));
|
||||
diskCache->setMaximumCacheSize(5*1024*1024); // 5Mo
|
||||
nam->setCache(diskCache);
|
||||
#endif
|
||||
|
||||
return nam;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,22 @@
|
|||
#ifndef MYNETWORKMANAGER_HH
|
||||
#define MYNETWORKMANAGER_HH
|
||||
|
||||
#include <qdeclarativenetworkaccessmanagerfactory.h>
|
||||
#if defined(Q_OS_SAILFISH)
|
||||
#include <QQmlNetworkAccessManagerFactory>
|
||||
#else
|
||||
#include <qdeclarativenetworkaccessmanagerfactory.h>
|
||||
#endif
|
||||
|
||||
#include <QtNetwork/qnetworkreply.h>
|
||||
#include <QtNetwork/QNetworkAccessManager>
|
||||
#include <QMutex>
|
||||
#include <QDebug>
|
||||
|
||||
#if defined(Q_OS_SAILFISH)
|
||||
class MyNetworkManager : public QObject, public QQmlNetworkAccessManagerFactory
|
||||
#else
|
||||
class MyNetworkManager : public QObject, public QDeclarativeNetworkAccessManagerFactory
|
||||
#endif
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ URL: http://example.org/
|
|||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source100: harbour-ttrss.yaml
|
||||
Requires: sailfishsilica-qt5 >= 0.10.9
|
||||
BuildRequires: pkgconfig(Qt5Quick)
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(sailfishapp) >= 0.0.10
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
BuildRequires: pkgconfig(Qt5Quick)
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
%description
|
||||
|
|
@ -62,14 +62,14 @@ desktop-file-install --delete-original \
|
|||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
/usr/share/harbour-ttrss/qml
|
||||
%{_bindir}
|
||||
%{_datadir}/%{name}/qml
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/86x86/apps/%{name}.png
|
||||
/usr/bin
|
||||
/usr/share/harbour-ttrss
|
||||
/usr/share/applications
|
||||
/usr/share/icons/hicolor/86x86/apps
|
||||
/usr/share/applications
|
||||
/usr/share/harbour-ttrss
|
||||
/usr/bin
|
||||
%{_datadir}/icons/hicolor/86x86/apps/%{name}.png
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/%{name}/qml
|
||||
%{_bindir}
|
||||
/usr/share/harbour-ttrss/qml
|
||||
# >> files
|
||||
# << files
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@ Description: |-
|
|||
Configure: none
|
||||
Builder: qtc5
|
||||
PkgConfigBR:
|
||||
- Qt5Quick
|
||||
- Qt5Qml
|
||||
- Qt5Core
|
||||
- sailfishapp >= 0.0.10
|
||||
- Qt5Core
|
||||
- Qt5Qml
|
||||
- Qt5Quick
|
||||
Requires:
|
||||
- sailfishsilica-qt5 >= 0.10.9
|
||||
Files:
|
||||
- /usr/share/harbour-ttrss/qml
|
||||
- '%{_bindir}'
|
||||
- '%{_datadir}/%{name}/qml'
|
||||
- '%{_datadir}/applications/%{name}.desktop'
|
||||
- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
|
||||
- /usr/bin
|
||||
- /usr/share/harbour-ttrss
|
||||
- /usr/share/applications
|
||||
- /usr/share/icons/hicolor/86x86/apps
|
||||
- /usr/share/applications
|
||||
- /usr/share/harbour-ttrss
|
||||
- /usr/bin
|
||||
- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
|
||||
- '%{_datadir}/applications/%{name}.desktop'
|
||||
- '%{_datadir}/%{name}/qml'
|
||||
- '%{_bindir}'
|
||||
- /usr/share/harbour-ttrss/qml
|
||||
PkgBR: []
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue