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
71314570
Commit
71314570
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I4c81a7852e7041328b7cfa320e907cc3cb863f04
parents
3704a616
ea099e34
6.2
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.4
5.5
5.6
5.7
5.8
5.9
5.9.8
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
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
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
No related merge requests found
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
dist/changes-5.4.0
+191
-0
dist/changes-5.4.0
src/controls/Private/ScrollBar.qml
+1
-1
src/controls/Private/ScrollBar.qml
src/controls/Private/TextInputWithHandles.qml
+3
-3
src/controls/Private/TextInputWithHandles.qml
src/controls/Slider.qml
+2
-0
src/controls/Slider.qml
src/controls/Styles/Android/SwitchStyle.qml
+14
-5
src/controls/Styles/Android/SwitchStyle.qml
src/controls/Styles/Android/drawables/AnimationDrawable.qml
+4
-1
src/controls/Styles/Android/drawables/AnimationDrawable.qml
src/controls/Styles/Android/drawables/ImageDrawable.qml
+28
-0
src/controls/Styles/Android/drawables/ImageDrawable.qml
src/controls/Styles/Android/drawables/StateDrawable.qml
+72
-4
src/controls/Styles/Android/drawables/StateDrawable.qml
src/controls/TextArea.qml
+3
-3
src/controls/TextArea.qml
src/controls/doc/images/qtquickcontrols-android.png
+0
-0
src/controls/doc/images/qtquickcontrols-android.png
src/controls/doc/images/qtquickcontrols-example-gallery-android.png
+0
-0
...ls/doc/images/qtquickcontrols-example-gallery-android.png
src/controls/doc/images/qtquickcontrols-example-gallery-osx.png
+0
-0
...ntrols/doc/images/qtquickcontrols-example-gallery-osx.png
src/controls/doc/images/qtquickcontrols-example-gallery.png
+0
-0
src/controls/doc/images/qtquickcontrols-example-gallery.png
src/controls/doc/src/applicationwindow.qdoc
+1
-0
src/controls/doc/src/applicationwindow.qdoc
src/controls/doc/src/controls.qdoc
+1
-0
src/controls/doc/src/controls.qdoc
src/controls/doc/src/menus.qdoc
+1
-0
src/controls/doc/src/menus.qdoc
src/controls/doc/src/qtquickcontrols-examples.qdoc
+16
-1
src/controls/doc/src/qtquickcontrols-examples.qdoc
src/controls/doc/src/qtquickcontrols-overview.qdoc
+1
-1
src/controls/doc/src/qtquickcontrols-overview.qdoc
src/controls/doc/src/qtquickcontrols-platformnotes.qdoc
+1
-1
src/controls/doc/src/qtquickcontrols-platformnotes.qdoc
src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
+1
-0
src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
with
340 additions
and
20 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