diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-04 13:50:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-04 14:13:39 +0100 |
| commit | 6722bbbf4ea2ddcdd9194f26a883029ec3afc39a (patch) | |
| tree | c3290b82fac21c4990be8472ae6cb4ca043205cf /src/core/api/qwebengineurlrequestjob.h | |
| parent | 41d69eb0fa2375f0da6ba9b35136f5598be4b3a4 (diff) | |
| parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) | |
Merge branch '5.6' into dev
Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
Diffstat (limited to 'src/core/api/qwebengineurlrequestjob.h')
| -rw-r--r-- | src/core/api/qwebengineurlrequestjob.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h index 8801e6bc0..afa542d7e 100644 --- a/src/core/api/qwebengineurlrequestjob.h +++ b/src/core/api/qwebengineurlrequestjob.h @@ -47,8 +47,8 @@ #include <QtCore/qurl.h> namespace QtWebEngineCore { -class URLRequestCustomJob; class URLRequestCustomJobDelegate; +class URLRequestCustomJobShared; } // namespace QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ public: private: QWebEngineUrlRequestJob(QtWebEngineCore::URLRequestCustomJobDelegate *); - friend class QtWebEngineCore::URLRequestCustomJob; + friend class QtWebEngineCore::URLRequestCustomJobShared; QtWebEngineCore::URLRequestCustomJobDelegate* d_ptr; }; |