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
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
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