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
028bd20e
Commit
028bd20e
authored
7 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.9 into 5.9.0
Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15
parents
4ea591e7
b24a6419
Changes
54
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
src/3rdparty
+1
-1
src/3rdparty
src/buildtools/gn.pro
+20
-26
src/buildtools/gn.pro
src/buildtools/ninja.pro
+15
-21
src/buildtools/ninja.pro
src/core/core.pro
+1
-1
src/core/core.pro
src/core/core_common.pri
+0
-4
src/core/core_common.pri
src/core/core_module.pro
+0
-3
src/core/core_module.pro
src/core/core_project.pro
+16
-1
src/core/core_project.pro
src/core/gn_run.pro
+12
-13
src/core/gn_run.pro
src/core/web_engine_context.cpp
+3
-0
src/core/web_engine_context.cpp
src/webengine/doc/qtwebengine.qdocconf
+1
-1
src/webengine/doc/qtwebengine.qdocconf
src/webengine/webengine.pro
+2
-1
src/webengine/webengine.pro
tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
+1
-1
tests/auto/quick/qmltests/data/tst_keyboardEvents.qml
tests/auto/quick/qmltests/data/tst_newViewRequest.qml
+3
-3
tests/auto/quick/qmltests/data/tst_newViewRequest.qml
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+1
-1
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
with
76 additions
and
77 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