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_contents_adapter_p.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_contents_adapter_p.h')
-rw-r--r-- | src/core/web_contents_adapter_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h index 0507ebf4a..5c0e83298 100644 --- a/src/core/web_contents_adapter_p.h +++ b/src/core/web_contents_adapter_p.h @@ -57,8 +57,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include <QExplicitlySharedDataPointer> #include <QScopedPointer> +#include <QSharedPointer> QT_FORWARD_DECLARE_CLASS(QTimer) QT_FORWARD_DECLARE_CLASS(QWebChannel) @@ -83,7 +83,7 @@ public: WebContentsAdapterPrivate(); ~WebContentsAdapterPrivate(); scoped_refptr<WebEngineContext> engineContext; - QExplicitlySharedDataPointer<BrowserContextAdapter> browserContextAdapter; + QSharedPointer<BrowserContextAdapter> browserContextAdapter; scoped_ptr<content::WebContents> webContents; scoped_ptr<WebContentsDelegateQt> webContentsDelegate; scoped_ptr<RenderViewObserverHostQt> renderViewObserverHost; |