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
7430a9da
Commit
7430a9da
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.11' into 5.12" into refs/staging/5.12
parents
f65c5fc1
34cd9bb6
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
src/3rdparty
+1
-1
src/3rdparty
src/core/configure.json
+14
-1
src/core/configure.json
src/core/content_browser_client_qt.cpp
+10
-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/content_main_delegate_qt.cpp
+6
-0
src/core/content_main_delegate_qt.cpp
src/core/content_main_delegate_qt.h
+3
-1
src/core/content_main_delegate_qt.h
src/core/content_utility_client_qt.cpp
+60
-0
src/core/content_utility_client_qt.cpp
src/core/content_utility_client_qt.h
+56
-0
src/core/content_utility_client_qt.h
src/core/core_chromium.pri
+2
-0
src/core/core_chromium.pri
src/core/login_delegate_qt.cpp
+1
-0
src/core/login_delegate_qt.cpp
src/core/profile_io_data_qt.cpp
+5
-4
src/core/profile_io_data_qt.cpp
src/core/profile_io_data_qt.h
+1
-1
src/core/profile_io_data_qt.h
src/core/qtwebengine.gni
+1
-0
src/core/qtwebengine.gni
tests/auto/widgets/proxypac/proxy.pac
+7
-0
tests/auto/widgets/proxypac/proxy.pac
tests/auto/widgets/proxypac/proxypac.pro
+28
-0
tests/auto/widgets/proxypac/proxypac.pro
tests/auto/widgets/proxypac/proxyserver.cpp
+84
-0
tests/auto/widgets/proxypac/proxyserver.cpp
tests/auto/widgets/proxypac/proxyserver.h
+62
-0
tests/auto/widgets/proxypac/proxyserver.h
tests/auto/widgets/proxypac/tst_proxypac.cpp
+73
-0
tests/auto/widgets/proxypac/tst_proxypac.cpp
tests/auto/widgets/widgets.pro
+3
-0
tests/auto/widgets/widgets.pro
with
418 additions
and
8 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