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.h | |
| 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.h')
| -rw-r--r-- | src/webenginewidgets/api/qwebengineprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h index ab36a7b16..b13f3d631 100644 --- a/src/webenginewidgets/api/qwebengineprofile.h +++ b/src/webenginewidgets/api/qwebengineprofile.h @@ -102,7 +102,7 @@ public: bool visitedLinksContainsUrl(const QUrl &url) const; QWebEngineSettings *settings() const; - QWebEngineScriptCollection &scripts(); + QWebEngineScriptCollection *scripts() const; static QWebEngineProfile *defaultProfile(); |