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
fa12e9c1
Commit
fa12e9c1
authored
7 years ago
by
Allan Sandfeld Jensen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
parents
9d962bc9
d0441402
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.15.3
5.15.4
5.15.5
5.15.6
5.15.7
6.2
6.2.0
6.2.1
6.2.2
wip/qtpdf
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
Changes
151
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LICENSE.Chromium
+27
-0
LICENSE.Chromium
examples/webengine/customdialogs/MessageRectangle.qml
+12
-2
examples/webengine/customdialogs/MessageRectangle.qml
examples/webengine/customdialogs/SwitchButton.qml
+12
-2
examples/webengine/customdialogs/SwitchButton.qml
examples/webengine/customdialogs/WebView.qml
+12
-2
examples/webengine/customdialogs/WebView.qml
examples/webengine/customdialogs/doc/src/customdialogs.qdoc
+4
-4
examples/webengine/customdialogs/doc/src/customdialogs.qdoc
examples/webengine/customdialogs/forms/Authentication.qml
+12
-2
examples/webengine/customdialogs/forms/Authentication.qml
examples/webengine/customdialogs/forms/AuthenticationForm.ui.qml
+12
-2
...s/webengine/customdialogs/forms/AuthenticationForm.ui.qml
examples/webengine/customdialogs/forms/Button.qml
+12
-2
examples/webengine/customdialogs/forms/Button.qml
examples/webengine/customdialogs/forms/ColorCell.qml
+12
-2
examples/webengine/customdialogs/forms/ColorCell.qml
examples/webengine/customdialogs/forms/ColorPicker.qml
+13
-3
examples/webengine/customdialogs/forms/ColorPicker.qml
examples/webengine/customdialogs/forms/ColorPickerForm.ui.qml
+12
-2
...ples/webengine/customdialogs/forms/ColorPickerForm.ui.qml
examples/webengine/customdialogs/forms/FilePicker.qml
+12
-2
examples/webengine/customdialogs/forms/FilePicker.qml
examples/webengine/customdialogs/forms/FilePickerForm.ui.qml
+12
-2
examples/webengine/customdialogs/forms/FilePickerForm.ui.qml
examples/webengine/customdialogs/forms/FileRow.qml
+12
-2
examples/webengine/customdialogs/forms/FileRow.qml
examples/webengine/customdialogs/forms/JavaScript.qml
+12
-2
examples/webengine/customdialogs/forms/JavaScript.qml
examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml
+12
-2
examples/webengine/customdialogs/forms/JavaScriptForm.ui.qml
examples/webengine/customdialogs/forms/Menu.qml
+12
-2
examples/webengine/customdialogs/forms/Menu.qml
examples/webengine/customdialogs/forms/MenuForm.ui.qml
+12
-2
examples/webengine/customdialogs/forms/MenuForm.ui.qml
examples/webengine/customdialogs/main.cpp
+12
-2
examples/webengine/customdialogs/main.cpp
examples/webengine/customdialogs/main.qml
+12
-2
examples/webengine/customdialogs/main.qml
with
248 additions
and
41 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