diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-02 13:13:10 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-02 13:13:10 +0100 |
| commit | ca731a7446f0485886a04474415a21d2f64e3f8b (patch) | |
| tree | 9ee153440866fbb28535d204f4dc467f36e867d0 /src/core/api | |
| parent | 98f6e0c9d28dbcbecc560abde7606bff7c8e4d99 (diff) | |
| parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) | |
Merge 5.6 into 5.6.0
Change-Id: Ifca953bf6fa663b81dba77a4e825d3917c8e33fc
Diffstat (limited to 'src/core/api')
| -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 922299fd9..84741b791 100644 --- a/src/core/api/qwebengineurlrequestjob.h +++ b/src/core/api/qwebengineurlrequestjob.h @@ -44,8 +44,8 @@ #include <QtCore/qurl.h> namespace QtWebEngineCore { -class URLRequestCustomJob; class URLRequestCustomJobDelegate; +class URLRequestCustomJobShared; } // namespace QT_BEGIN_NAMESPACE @@ -76,7 +76,7 @@ public: private: QWebEngineUrlRequestJob(QtWebEngineCore::URLRequestCustomJobDelegate *); - friend class QtWebEngineCore::URLRequestCustomJob; + friend class QtWebEngineCore::URLRequestCustomJobShared; QtWebEngineCore::URLRequestCustomJobDelegate* d_ptr; }; |