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
QtQuickControls
Commits
cf32efbe
Commit
cf32efbe
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
parents
9b340999
9dc39b7f
6.2
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
dev
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
No related merge requests found
Changes
28
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LICENSE.GPLv2
+0
-292
LICENSE.GPLv2
LICENSE.GPLv3
+0
-686
LICENSE.GPLv3
LICENSE.LGPLv3
+0
-175
LICENSE.LGPLv3
src/controls/Styles/Base/CalendarStyle.qml
+5
-3
src/controls/Styles/Base/CalendarStyle.qml
src/controls/doc/src/qtquickcontrols-index.qdoc
+9
-0
src/controls/doc/src/qtquickcontrols-index.qdoc
src/dialogs/doc/src/qtquickdialogs-index.qdoc
+9
-1
src/dialogs/doc/src/qtquickdialogs-index.qdoc
src/extras/doc/src/qtquickextras-index.qdoc
+9
-0
src/extras/doc/src/qtquickextras-index.qdoc
tests/auto/controls/data/tst_calendar.qml
+10
-0
tests/auto/controls/data/tst_calendar.qml
tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml
+14
-0
.../benchmarks/qmlbench/creation/delegates_busyindicator.qml
tests/benchmarks/qmlbench/creation/delegates_button.qml
+15
-0
tests/benchmarks/qmlbench/creation/delegates_button.qml
tests/benchmarks/qmlbench/creation/delegates_checkbox.qml
+15
-0
tests/benchmarks/qmlbench/creation/delegates_checkbox.qml
tests/benchmarks/qmlbench/creation/delegates_combobox.qml
+15
-0
tests/benchmarks/qmlbench/creation/delegates_combobox.qml
tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml
+15
-0
tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml
tests/benchmarks/qmlbench/creation/delegates_dial.qml
+14
-0
tests/benchmarks/qmlbench/creation/delegates_dial.qml
tests/benchmarks/qmlbench/creation/delegates_groupbox.qml
+18
-0
tests/benchmarks/qmlbench/creation/delegates_groupbox.qml
tests/benchmarks/qmlbench/creation/delegates_label.qml
+14
-0
tests/benchmarks/qmlbench/creation/delegates_label.qml
tests/benchmarks/qmlbench/creation/delegates_menu.qml
+22
-0
tests/benchmarks/qmlbench/creation/delegates_menu.qml
tests/benchmarks/qmlbench/creation/delegates_progressbar.qml
+14
-0
tests/benchmarks/qmlbench/creation/delegates_progressbar.qml
tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml
+15
-0
tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml
tests/benchmarks/qmlbench/creation/delegates_scrollview.qml
+19
-0
tests/benchmarks/qmlbench/creation/delegates_scrollview.qml
with
232 additions
and
1157 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