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
4181db05
Commit
4181db05
authored
5 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
parents
b546cea1
26ac59af
No related merge requests found
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
dist/changes-5.12.3
+79
-0
dist/changes-5.12.3
examples/webenginewidgets/printme/data/data.qrc
+7
-0
examples/webenginewidgets/printme/data/data.qrc
examples/webenginewidgets/printme/data/icon.svg
+24
-0
examples/webenginewidgets/printme/data/icon.svg
examples/webenginewidgets/printme/data/index.html
+24
-0
examples/webenginewidgets/printme/data/index.html
examples/webenginewidgets/printme/data/style.css
+72
-0
examples/webenginewidgets/printme/data/style.css
examples/webenginewidgets/printme/doc/images/printme-example.png
+0
-0
...s/webenginewidgets/printme/doc/images/printme-example.png
examples/webenginewidgets/printme/doc/src/printme.qdoc
+98
-0
examples/webenginewidgets/printme/doc/src/printme.qdoc
examples/webenginewidgets/printme/main.cpp
+76
-0
examples/webenginewidgets/printme/main.cpp
examples/webenginewidgets/printme/printhandler.cpp
+115
-0
examples/webenginewidgets/printme/printhandler.cpp
examples/webenginewidgets/printme/printhandler.h
+79
-0
examples/webenginewidgets/printme/printhandler.h
examples/webenginewidgets/printme/printme.pro
+9
-0
examples/webenginewidgets/printme/printme.pro
examples/webenginewidgets/simplebrowser/browser.cpp
+7
-6
examples/webenginewidgets/simplebrowser/browser.cpp
examples/webenginewidgets/simplebrowser/browser.h
+1
-1
examples/webenginewidgets/simplebrowser/browser.h
examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
+16
-7
...webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
examples/webenginewidgets/webenginewidgets.pro
+5
-2
examples/webenginewidgets/webenginewidgets.pro
mkspecs/features/configure.prf
+4
-0
mkspecs/features/configure.prf
src/core/api/qwebengineurlscheme.cpp
+5
-0
src/core/api/qwebengineurlscheme.cpp
src/core/config/windows.pri
+2
-0
src/core/config/windows.pri
src/core/printing/print_view_manager_qt.cpp
+15
-13
src/core/printing/print_view_manager_qt.cpp
src/core/profile_qt.cpp
+3
-1
src/core/profile_qt.cpp
with
641 additions
and
30 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