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
92935c5d
Commit
92935c5d
authored
9 years ago
by
Allan Sandfeld Jensen
Committed by
The Qt Project
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/dev' into 5.6" into refs/staging/5.6
parents
f6d21fb0
f1dcd959
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
examples/webenginewidgets/browser/browser.pro
+0
-5
examples/webenginewidgets/browser/browser.pro
examples/webenginewidgets/browser/browserapplication.cpp
+15
-9
examples/webenginewidgets/browser/browserapplication.cpp
examples/webenginewidgets/browser/downloadmanager.cpp
+0
-1
examples/webenginewidgets/browser/downloadmanager.cpp
examples/webenginewidgets/browser/networkaccessmanager.cpp
+0
-160
examples/webenginewidgets/browser/networkaccessmanager.cpp
examples/webenginewidgets/browser/networkaccessmanager.h
+0
-75
examples/webenginewidgets/browser/networkaccessmanager.h
examples/webenginewidgets/browser/settings.cpp
+0
-2
examples/webenginewidgets/browser/settings.cpp
examples/webenginewidgets/browser/webview.cpp
+0
-1
examples/webenginewidgets/browser/webview.cpp
src/webengine/api/qquickwebengineprofile_p.h
+3
-3
src/webengine/api/qquickwebengineprofile_p.h
src/webengine/plugin/plugin.cpp
+1
-0
src/webengine/plugin/plugin.cpp
with
19 additions
and
256 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
