From 2f3aca28242fb4849f62b7391460ba66361f29d7 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 16 Jun 2009 15:47:42 +1000
Subject: Use system configuration for proxy settings

---
 tools/qmlviewer/qmlviewer.cpp | 18 ++++++++++++++++++
 tools/qmlviewer/qmlviewer.h   |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 75a8f1c..af543c9 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -39,6 +39,7 @@
 #include <QAction>
 #include <QFileDialog>
 #include <QTimer>
+#include <QNetworkProxyFactory>
 
 class PreviewDeviceSkin : public DeviceSkin
 {
@@ -153,6 +154,8 @@ QmlViewer::QmlViewer(QFxTestEngine::TestMode testMode, const QString &testDir, Q
     if (mb)
         layout->addWidget(mb);
     layout->addWidget(canvas);
+
+    setupProxy();
 }
 
 QMenuBar *QmlViewer::menuBar() const
@@ -677,6 +680,21 @@ void QmlViewer::setDeviceKeys(bool on)
     devicemode = on;
 }
 
+void QmlViewer::setupProxy()
+{
+    class SystemProxyFactory : public QNetworkProxyFactory
+    {
+    public:
+        virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query)
+        {
+            return QNetworkProxyFactory::systemProxyForQuery(query);
+        }
+    };
+
+    QNetworkAccessManager * nam = canvas->engine()->networkAccessManager();
+    nam->setProxyFactory(new SystemProxyFactory);
+}
+
 void QmlViewer::setCacheEnabled(bool on)
 {
     QNetworkAccessManager * nam = canvas->engine()->networkAccessManager();
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index 45ec446..9de47a8 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -68,6 +68,8 @@ private slots:
     void setScaleView();
 
 private:
+    void setupProxy();
+
     QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
-- 
cgit v0.12