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
72472b8b
Commit
72472b8b
authored
10 years ago
by
Frederik Gladhorn
Committed by
The Qt Project
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
parents
ad17dd16
3ec6544f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/core/config/desktop_linux.pri
+1
-0
src/core/config/desktop_linux.pri
src/core/config/embedded_linux.pri
+1
-1
src/core/config/embedded_linux.pri
src/process/process.pro
+1
-1
src/process/process.pro
src/webengine/ui_delegates_manager.cpp
+12
-9
src/webengine/ui_delegates_manager.cpp
with
15 additions
and
11 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
