diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-25 11:47:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-25 12:40:00 +0200 |
| commit | 658a964cf2593e6da3b1a822124e796bbe354d36 (patch) | |
| tree | 8c35a964023069a974f1c54cd679490593e485f2 /src/core/web_engine_context.h | |
| parent | 63cf26268996ae5580c77095a252696fa549b593 (diff) | |
| parent | a3318c84b022282a5a4a2babc51d1e3ca634e25b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
Diffstat (limited to 'src/core/web_engine_context.h')
| -rw-r--r-- | src/core/web_engine_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index 3c69d87ca..960f8ed47 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -47,7 +47,7 @@ #include "base/values.h" #include "components/devtools_http_handler/devtools_http_handler.h" -#include <QExplicitlySharedDataPointer> +#include <QSharedPointer> namespace base { class RunLoop; @@ -76,7 +76,7 @@ class WebEngineContext : public base::RefCounted<WebEngineContext> { public: static scoped_refptr<WebEngineContext> current(); - QtWebEngineCore::BrowserContextAdapter *defaultBrowserContext(); + QSharedPointer<QtWebEngineCore::BrowserContextAdapter> defaultBrowserContext(); QObject *globalQObject(); #if defined(ENABLE_BASIC_PRINTING) printing::PrintJobManager* getPrintJobManager(); @@ -94,7 +94,7 @@ private: scoped_ptr<content::ContentMainRunner> m_contentRunner; scoped_ptr<content::BrowserMainRunner> m_browserRunner; QObject* m_globalQObject; - QExplicitlySharedDataPointer<BrowserContextAdapter> m_defaultBrowserContext; + QSharedPointer<QtWebEngineCore::BrowserContextAdapter> m_defaultBrowserContext; scoped_ptr<devtools_http_handler::DevToolsHttpHandler> m_devtools; #if defined(ENABLE_BASIC_PRINTING) scoped_ptr<printing::PrintJobManager> m_printJobManager; |