diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 16:59:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-27 14:58:43 +0000 |
| commit | c003ae7dfe1655e257fa1d607550d982e2e9b23f (patch) | |
| tree | d24defce427885c2592c92b65c517f62e23e4325 /src/core/proxy_config_service_qt.cpp | |
| parent | dffe673c3044a6351aa72b69a5bf60429259c08c (diff) | |
Adapting to Chromium 47
Updating to Chromium 47 and adapting API.
Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/proxy_config_service_qt.cpp')
| -rw-r--r-- | src/core/proxy_config_service_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/proxy_config_service_qt.cpp b/src/core/proxy_config_service_qt.cpp index fc0959eef..21d10c27d 100644 --- a/src/core/proxy_config_service_qt.cpp +++ b/src/core/proxy_config_service_qt.cpp @@ -66,8 +66,8 @@ net::ProxyServer ProxyConfigServiceQt::fromQNetworkProxy(const QNetworkProxy &qt //================ Based on ChromeProxyConfigService ======================= -ProxyConfigServiceQt::ProxyConfigServiceQt(net::ProxyConfigService *baseService) - : m_baseService(baseService), +ProxyConfigServiceQt::ProxyConfigServiceQt(scoped_ptr<ProxyConfigService> baseService) + : m_baseService(baseService.release()), m_registeredObserver(false) { } |