Browse Source

Add network proxy support (#3687)

QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
ef77e497d8
  1. 3
      src/QGCApplication.cc
  2. 5
      src/QGCFileDownload.cc
  3. 1
      src/QtLocationPlugin/QGCMapUrlEngine.cpp
  4. 5
      src/VehicleSetup/FirmwareUpgradeController.cc

3
src/QGCApplication.cc

@ -196,6 +196,9 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) @@ -196,6 +196,9 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
#endif
// Setup for network proxy support
QNetworkProxyFactory::setUseSystemConfiguration(true);
#ifdef Q_OS_LINUX
#ifndef __mobile__
if (!_runningUnitTests) {

5
src/QGCFileDownload.cc

@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#include <QFileInfo>
#include <QStandardPaths>
#include <QNetworkProxy>
QGCFileDownload::QGCFileDownload(QObject* parent)
: QNetworkAccessManager(parent)
@ -62,6 +63,10 @@ bool QGCFileDownload::download(const QString& remoteFile) @@ -62,6 +63,10 @@ bool QGCFileDownload::download(const QString& remoteFile)
}
QNetworkRequest networkRequest(remoteUrl);
QNetworkProxy tProxy;
tProxy.setType(QNetworkProxy::DefaultProxy);
setProxy(tProxy);
// Store local file location in user attribute so we can retrieve when the download finishes
networkRequest.setAttribute(QNetworkRequest::User, localFile);

1
src/QtLocationPlugin/QGCMapUrlEngine.cpp

@ -41,7 +41,6 @@ UrlFactory::UrlFactory() @@ -41,7 +41,6 @@ UrlFactory::UrlFactory()
_language = langs[0];
}
QNetworkProxyFactory::setUseSystemConfiguration(true);
// Google version strings
_versionGoogleMap = "m@338000000";
_versionGoogleSatellite = "198";

5
src/VehicleSetup/FirmwareUpgradeController.cc

@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QNetworkProxy>
struct FirmwareToUrlElement_t {
FirmwareUpgradeController::AutoPilotStackType_t stackType;
@ -533,6 +534,10 @@ void FirmwareUpgradeController::_downloadFirmware(void) @@ -533,6 +534,10 @@ void FirmwareUpgradeController::_downloadFirmware(void)
_downloadManager = new QNetworkAccessManager(this);
Q_CHECK_PTR(_downloadManager);
QNetworkProxy tProxy;
tProxy.setType(QNetworkProxy::DefaultProxy);
_downloadManager->setProxy(tProxy);
_downloadNetworkReply = _downloadManager->get(networkRequest);
Q_ASSERT(_downloadNetworkReply);
connect(_downloadNetworkReply, &QNetworkReply::downloadProgress, this, &FirmwareUpgradeController::_downloadProgress);

Loading…
Cancel
Save