diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 11:40:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 11:45:46 +0200 |
| commit | b3f7d3a62e00e611e8d7f592ae048a9536b635c6 (patch) | |
| tree | e88ce4289a42dbfcc828fab1f96dbabbf1572725 /src/core/network_delegate_qt.h | |
| parent | c0d5f7e6c10e56777b025b83a1fc53c610927714 (diff) | |
| parent | 80a2497207b3824852578df63b30d8af4ee800a3 (diff) | |
Merge Chromium 44 and fixes
Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch,
which contains all the patches to build against Chromium 44.
Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
Diffstat (limited to 'src/core/network_delegate_qt.h')
| -rw-r--r-- | src/core/network_delegate_qt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/network_delegate_qt.h b/src/core/network_delegate_qt.h index 4f4097fd3..825045642 100644 --- a/src/core/network_delegate_qt.h +++ b/src/core/network_delegate_qt.h @@ -37,7 +37,7 @@ #ifndef NETWORK_DELEGATE_QT_H #define NETWORK_DELEGATE_QT_H -#include "net/base/network_delegate.h" +#include "net/base/network_delegate_impl.h" #include "net/base/net_errors.h" #include <QUrl> @@ -46,7 +46,7 @@ namespace QtWebEngineCore { -class NetworkDelegateQt : public net::NetworkDelegate { +class NetworkDelegateQt : public net::NetworkDelegateImpl { public: NetworkDelegateQt() {} virtual ~NetworkDelegateQt() {} |