Skip to content
GitLab
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
a3a912e6
Commit
a3a912e6
authored
6 years ago
by
Allan Sandfeld Jensen
Committed by
The Qt Project
6 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
parents
af7ea0fd
01dce2df
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/webengine/recipebrowser/resources/pages/burger.html
+1
-0
examples/webengine/recipebrowser/resources/pages/burger.html
examples/webengine/recipebrowser/resources/pages/cupcakes.html
+1
-0
...les/webengine/recipebrowser/resources/pages/cupcakes.html
examples/webengine/recipebrowser/resources/pages/pasta.html
+1
-0
examples/webengine/recipebrowser/resources/pages/pasta.html
examples/webengine/recipebrowser/resources/pages/pizza.html
+1
-0
examples/webengine/recipebrowser/resources/pages/pizza.html
examples/webengine/recipebrowser/resources/pages/skewers.html
+1
-0
...ples/webengine/recipebrowser/resources/pages/skewers.html
examples/webengine/recipebrowser/resources/pages/soup.html
+1
-0
examples/webengine/recipebrowser/resources/pages/soup.html
examples/webengine/recipebrowser/resources/pages/steak.html
+1
-0
examples/webengine/recipebrowser/resources/pages/steak.html
examples/webengine/recipebrowser/resources/qml/RecipeList.qml
+1
-1
...ples/webengine/recipebrowser/resources/qml/RecipeList.qml
examples/webengine/recipebrowser/resources/qml/main.qml
+2
-4
examples/webengine/recipebrowser/resources/qml/main.qml
src/3rdparty
+1
-1
src/3rdparty
src/core/common/qt_messages.h
+3
-0
src/core/common/qt_messages.h
src/core/config/common.pri
+7
-0
src/core/config/common.pri
src/core/config/linux.pri
+1
-0
src/core/config/linux.pri
src/core/config/windows.pri
+2
-1
src/core/config/windows.pri
src/core/render_widget_host_view_qt.cpp
+4
-2
src/core/render_widget_host_view_qt.cpp
src/core/renderer/render_view_observer_qt.cpp
+6
-0
src/core/renderer/render_view_observer_qt.cpp
src/core/renderer/render_view_observer_qt.h
+1
-0
src/core/renderer/render_view_observer_qt.h
src/core/web_contents_adapter_client.h
+1
-1
src/core/web_contents_adapter_client.h
src/core/web_contents_delegate_qt.cpp
+6
-0
src/core/web_contents_delegate_qt.cpp
src/core/web_contents_delegate_qt.h
+1
-0
src/core/web_contents_delegate_qt.h
with
43 additions
and
10 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