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
8c6f0872
Commit
8c6f0872
authored
10 years ago
by
Andras Becsi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I2c48688f5f034233660bd7891693f81525fc1d6d
parents
aa1b2d20
c5957ac9
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
No related merge requests found
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/webengine/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg
+0
-0
...ine/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg
examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+41
-0
.../webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
examples/webenginewidgets/browser/doc/src/browser.qdoc
+4
-1
examples/webenginewidgets/browser/doc/src/browser.qdoc
examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc
+4
-1
...s/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc
src/3rdparty
+1
-1
src/3rdparty
src/core/Info_mac.plist
+20
-0
src/core/Info_mac.plist
src/core/access_token_store_qt.cpp
+56
-0
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
+57
-0
src/core/access_token_store_qt.h
src/core/config/embedded_linux.pri
+1
-0
src/core/config/embedded_linux.pri
src/core/content_browser_client_qt.cpp
+6
-0
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
+1
-0
src/core/content_browser_client_qt.h
src/core/core.pro
+0
-27
src/core/core.pro
src/core/core_gyp_generator.pro
+2
-0
src/core/core_gyp_generator.pro
src/core/core_module.pro
+47
-0
src/core/core_module.pro
src/core/render_widget_host_view_qt.cpp
+10
-0
src/core/render_widget_host_view_qt.cpp
src/core/renderer/content_renderer_client_qt.h
+4
-0
src/core/renderer/content_renderer_client_qt.h
src/core/renderer/qt_render_view_observer.h
+4
-0
src/core/renderer/qt_render_view_observer.h
src/core/web_engine_context.cpp
+4
-0
src/core/web_engine_context.cpp
src/core/web_engine_library_info.cpp
+55
-1
src/core/web_engine_library_info.cpp
src/process/process.pro
+31
-5
src/process/process.pro
with
348 additions
and
36 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