summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/browser/settings.cpp
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-05-15 15:58:14 +0200
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-08-19 16:17:00 +0000
commitdc7d93ef5364f82b5131143532b41620d57d9548 (patch)
treeaec019a6a6158317c738530cb20bbe76f9aa55e7 /examples/webenginewidgets/browser/settings.cpp
parent13d03ef21d3bd67595bd0b36be7401f6e6bcbbd6 (diff)
Demo browser: add proxy support
And remove NetworkAccessManager-related dead code. Change-Id: I6246aaaa1bbdda43ed0453e7acd0f2df33f58edd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'examples/webenginewidgets/browser/settings.cpp')
-rw-r--r--examples/webenginewidgets/browser/settings.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/webenginewidgets/browser/settings.cpp b/examples/webenginewidgets/browser/settings.cpp
index ee8c719b4..35e5e26c9 100644
--- a/examples/webenginewidgets/browser/settings.cpp
+++ b/examples/webenginewidgets/browser/settings.cpp
@@ -47,7 +47,6 @@
#include "cookiejar.h"
#endif
#include "history.h"
-#include "networkaccessmanager.h"
#include "webview.h"
#include <QtCore/QLocale>
@@ -240,7 +239,6 @@ void SettingsDialog::saveToSettings()
BrowserApplication::instance()->loadSettings();
#if defined(QWEBENGINEPAGE_SETNETWORKACCESSMANAGER)
- BrowserApplication::networkAccessManager()->loadSettings();
BrowserApplication::cookieJar()->loadSettings();
#endif
BrowserApplication::historyManager()->loadSettings();