diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:20:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:20:58 +0200 |
| commit | cba8f2605f34649e3ca2a767edc7ac9509e7fee9 (patch) | |
| tree | c3fbf81bc0eee5db87c357366b22ffd62b9c3dcc /src/webenginewidgets/api/qwebengineprofile.cpp | |
| parent | 0c366eb741d8d925418c517d3954900c090aca3d (diff) | |
| parent | 434ef539381bbc3c19f54f914d5bda83eafdc92b (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/webenginewidgets/api/qwebenginepage.cpp
Change-Id: Idb33c92bd53fab76eee8fedb542dbf5e4a10f9e6
Diffstat (limited to 'src/webenginewidgets/api/qwebengineprofile.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebengineprofile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp index eda242102..afe2277f2 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/webenginewidgets/api/qwebengineprofile.cpp @@ -104,8 +104,8 @@ using QtWebEngineCore::BrowserContextAdapter; */ QWebEngineProfilePrivate::QWebEngineProfilePrivate(BrowserContextAdapter* browserContext) - : scriptCollection(new QWebEngineScriptCollectionPrivate(browserContext->userScriptController())) - , m_settings(new QWebEngineSettings()) + : m_settings(new QWebEngineSettings()) + , m_scriptCollection(new QWebEngineScriptCollection(new QWebEngineScriptCollectionPrivate(browserContext->userScriptController()))) , m_browserContextRef(browserContext) { m_browserContextRef->addClient(this); @@ -451,10 +451,10 @@ bool QWebEngineProfile::visitedLinksContainsUrl(const QUrl &url) const Returns the script collection used by this profile. \sa QWebEngineScriptCollection */ -QWebEngineScriptCollection &QWebEngineProfile::scripts() +QWebEngineScriptCollection *QWebEngineProfile::scripts() const { - Q_D(QWebEngineProfile); - return d->scriptCollection; + Q_D(const QWebEngineProfile); + return d->m_scriptCollection.data(); } /*! |