diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-15 13:16:24 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:28 +0000 |
commit | baaab31631dcff6075418c95f0220e8fb207dd50 (patch) | |
tree | eea3e8e723f0b142965d7c13ce23d061e73d3cc8 /src/core/proxy_config_service_qt.cpp | |
parent | e462c0919113b7aae0a24fc438bce648c9fbcfc2 (diff) |
Adaptations to Chromium 52
Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/proxy_config_service_qt.cpp')
-rw-r--r-- | src/core/proxy_config_service_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/proxy_config_service_qt.cpp b/src/core/proxy_config_service_qt.cpp index bd5d0375d..28a36d37f 100644 --- a/src/core/proxy_config_service_qt.cpp +++ b/src/core/proxy_config_service_qt.cpp @@ -69,7 +69,7 @@ net::ProxyServer ProxyConfigServiceQt::fromQNetworkProxy(const QNetworkProxy &qt //================ Based on ChromeProxyConfigService ======================= -ProxyConfigServiceQt::ProxyConfigServiceQt(scoped_ptr<ProxyConfigService> baseService) +ProxyConfigServiceQt::ProxyConfigServiceQt(std::unique_ptr<ProxyConfigService> baseService) : m_baseService(baseService.release()), m_registeredObserver(false) { |