Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtWebEngine
Commits
e929af14
Commit
e929af14
authored
10 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Change-Id: I01615a492c958bf123deeef5d2ddf9fb01b1a9d0
parents
0b5a7d61
f343e9d6
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.15.3
5.15.4
5.15.5
5.15.6
5.15.7
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
wip/47-based
wip/qtpdf
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
No related merge requests found
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
examples/webengine/quicknanobrowser/quickwindow.qml
+2
-2
examples/webengine/quicknanobrowser/quickwindow.qml
examples/webengine/quicknanobrowser/util.h
+1
-1
examples/webengine/quicknanobrowser/util.h
examples/webenginewidgets/browser/browsermainwindow.cpp
+3
-1
examples/webenginewidgets/browser/browsermainwindow.cpp
examples/webenginewidgets/browser/browsermainwindow.h
+2
-0
examples/webenginewidgets/browser/browsermainwindow.h
examples/webenginewidgets/browser/data/defaultbookmarks.xbel
+4
-7
examples/webenginewidgets/browser/data/defaultbookmarks.xbel
examples/webenginewidgets/browser/featurepermissionbar.cpp
+3
-3
examples/webenginewidgets/browser/featurepermissionbar.cpp
examples/webenginewidgets/browser/settings.cpp
+1
-1
examples/webenginewidgets/browser/settings.cpp
examples/webenginewidgets/browser/webview.cpp
+4
-1
examples/webenginewidgets/browser/webview.cpp
src/core/browser_context_qt.cpp
+13
-1
src/core/browser_context_qt.cpp
src/core/browser_context_qt.h
+1
-0
src/core/browser_context_qt.h
src/core/url_request_context_getter_qt.cpp
+5
-4
src/core/url_request_context_getter_qt.cpp
src/core/url_request_context_getter_qt.h
+3
-2
src/core/url_request_context_getter_qt.h
src/webenginewidgets/api/qwebenginepage.cpp
+8
-8
src/webenginewidgets/api/qwebenginepage.cpp
src/webenginewidgets/api/qwebenginepage.h
+10
-6
src/webenginewidgets/api/qwebenginepage.h
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+3
-5
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
tests/quicktestbrowser/quickwindow.qml
+8
-0
tests/quicktestbrowser/quickwindow.qml
with
71 additions
and
42 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets