[ssu] Get proxy configuration from connman

sailfishos · Nov 7, 2013 · 37300dc · 37300dc
1 parent b48fad8
commit 37300dc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/rndssucli/main.cpp b/rndssucli/main.cpp
@@ -10,7 +10,7 @@
 #include <QLocale>
 #include <QLibraryInfo>
 #include <QTimer>
-#include <QNetworkProxyFactory>
+#include <connman-qt5/connmannetworkproxyfactory.h>
 #include "rndssucli.h"
 
 int main(int argc, char** argv){
@@ -24,7 +24,7 @@ int main(int argc, char** argv){
                     QLibraryInfo::location(QLibraryInfo::TranslationsPath));
   app.installTranslator(&qtTranslator);
 
-  QNetworkProxyFactory::setUseSystemConfiguration(true);
+  QNetworkProxyFactory::setApplicationProxyFactory(new ConnmanNetworkProxyFactory);
 
   RndSsuCli mw;
   QTimer::singleShot(0, &mw, SLOT(run()));

diff --git a/rndssucli/rndssucli.pro b/rndssucli/rndssucli.pro
@@ -3,6 +3,8 @@ include(../ssuapplication.pri)
 include(rndssucli_dependencies.pri)
 
 QT += network dbus
+CONFIG += link_pkgconfig
+PKGCONFIG += connman-qt5
 
 HEADERS = rndssucli.h \
         ssuproxy.h

diff --git a/rpm/ssu.spec b/rpm/ssu.spec
@@ -16,6 +16,7 @@ BuildRequires: pkgconfig(Qt5SystemInfo)
 BuildRequires: pkgconfig(libzypp)
 BuildRequires: pkgconfig(libsystemd-journal)
 BuildRequires: pkgconfig(libshadowutils)
+BuildRequires: pkgconfig(connman-qt5)
 BuildRequires: oneshot
 BuildRequires: doxygen
 Requires(pre): shadow-utils

diff --git a/ssud/main.cpp b/ssud/main.cpp
@@ -9,7 +9,7 @@
 #include <QTranslator>
 #include <QLocale>
 #include <QLibraryInfo>
-#include <QNetworkProxyFactory>
+#include <connman-qt5/connmannetworkproxyfactory.h>
 #include "ssud.h"
 
 int main(int argc, char** argv){
@@ -23,7 +23,7 @@ int main(int argc, char** argv){
                     QLibraryInfo::location(QLibraryInfo::TranslationsPath));
   app.installTranslator(&qtTranslator);
 
-  QNetworkProxyFactory::setUseSystemConfiguration(true);
+  QNetworkProxyFactory::setApplicationProxyFactory(new ConnmanNetworkProxyFactory);
 
   Ssud ssud;
 

diff --git a/ssud/ssud.pro b/ssud/ssud.pro
@@ -3,6 +3,8 @@ include(../ssuapplication.pri)
 include(ssud_dependencies.pri)
 
 QT += network dbus
+CONFIG += link_pkgconfig
+PKGCONFIG += connman-qt5
 
 HEADERS = ssuadaptor.h \
         ssud.h

diff --git a/ssuurlresolver/main.cpp b/ssuurlresolver/main.cpp
@@ -10,7 +10,7 @@
 #include <QLocale>
 #include <QLibraryInfo>
 #include <QTimer>
-#include <QNetworkProxyFactory>
+#include <connman-qt5/connmannetworkproxyfactory.h>
 #include "ssuurlresolver.h"
 
 int main(int argc, char** argv){
@@ -24,7 +24,7 @@ int main(int argc, char** argv){
                     QLibraryInfo::location(QLibraryInfo::TranslationsPath));
   app.installTranslator(&qtTranslator);
 
-  QNetworkProxyFactory::setUseSystemConfiguration(true);
+  QNetworkProxyFactory::setApplicationProxyFactory(new ConnmanNetworkProxyFactory);
 
   SsuUrlResolver mw;
   QTimer::singleShot(0, &mw, SLOT(run()));

diff --git a/ssuurlresolver/ssuurlresolver.pro b/ssuurlresolver/ssuurlresolver.pro
@@ -7,6 +7,8 @@ DESTDIR = $$DESTDIR_LIB/zypp/plugins/urlresolver
 target.path = /usr/lib/zypp/plugins/urlresolver
 
 QT += network
+CONFIG += link_pkgconfig
+PKGCONFIG += connman-qt5
 
 HEADERS = ssuurlresolver.h
 SOURCES = main.cpp \