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
fc37a396
Commit
fc37a396
authored
7 years ago
by
Allan Sandfeld Jensen
Committed by
The Qt Project
7 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
parents
f52737f6
092842b5
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
config.tests/hostcompiler/hostcompiler.pro
+9
-0
config.tests/hostcompiler/hostcompiler.pro
config.tests/hostcompiler/main.cpp
+6
-0
config.tests/hostcompiler/main.cpp
configure.json
+36
-2
configure.json
configure.pri
+14
-0
configure.pri
examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc
+3
-3
...ewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc
mkspecs/features/configure.prf
+13
-0
mkspecs/features/configure.prf
mkspecs/features/functions.prf
+15
-0
mkspecs/features/functions.prf
src/core/config/common.pri
+12
-1
src/core/config/common.pri
src/core/config/linux.pri
+8
-1
src/core/config/linux.pri
src/core/gl_surface_qt.cpp
+1
-1
src/core/gl_surface_qt.cpp
src/core/print_view_manager_qt.cpp
+25
-15
src/core/print_view_manager_qt.cpp
src/core/render_widget_host_view_qt.cpp
+2
-1
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_adapter.cpp
+0
-2
src/core/web_contents_adapter.cpp
src/core/web_contents_delegate_qt.cpp
+7
-0
src/core/web_contents_delegate_qt.cpp
src/core/web_contents_delegate_qt.h
+1
-1
src/core/web_contents_delegate_qt.h
src/webengine/api/qquickwebenginetestsupport.cpp
+9
-7
src/webengine/api/qquickwebenginetestsupport.cpp
src/webengine/api/qquickwebengineview.cpp
+18
-18
src/webengine/api/qquickwebengineview.cpp
src/webenginewidgets/api/qwebenginepage.cpp
+11
-6
src/webenginewidgets/api/qwebenginepage.cpp
tests/auto/quick/qmltests/BLACKLIST
+0
-1
tests/auto/quick/qmltests/BLACKLIST
tests/auto/quick/qmltests/data/tst_mouseClick.qml
+17
-0
tests/auto/quick/qmltests/data/tst_mouseClick.qml
with
207 additions
and
59 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