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
0bcb1054
Commit
0bcb1054
authored
10 years ago
by
Jani Heikkinen
Committed by
The Qt Project
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
parents
313ae1c3
d162d3b0
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
wip/tizen
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
v5.4.0
v5.4.0-rc1
No related merge requests found
Changes
64
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.gitignore
+2
-2
.gitignore
examples/quick/controls/controls.pro
+0
-1
examples/quick/controls/controls.pro
examples/quick/controls/splitview/splitview.qmlproject
+0
-16
examples/quick/controls/splitview/splitview.qmlproject
examples/quick/controls/tableview/images/header.png
+0
-0
examples/quick/controls/tableview/images/header.png
examples/quick/controls/tableview/images/selectedrow.png
+0
-0
examples/quick/controls/tableview/images/selectedrow.png
examples/quick/controls/tableview/images/sort-up.png
+0
-0
examples/quick/controls/tableview/images/sort-up.png
examples/quick/controls/tableview/main.qml
+117
-352
examples/quick/controls/tableview/main.qml
examples/quick/controls/tableview/resources.qrc
+0
-8
examples/quick/controls/tableview/resources.qrc
examples/quick/controls/tableview/src/main.cpp
+12
-2
examples/quick/controls/tableview/src/main.cpp
examples/quick/controls/tableview/src/sortfilterproxymodel.cpp
+189
-0
...les/quick/controls/tableview/src/sortfilterproxymodel.cpp
examples/quick/controls/tableview/src/sortfilterproxymodel.h
+111
-0
examples/quick/controls/tableview/src/sortfilterproxymodel.h
examples/quick/controls/tableview/src/src.pri
+7
-1
examples/quick/controls/tableview/src/src.pri
examples/quick/controls/tableview/tableview.pro
+5
-6
examples/quick/controls/tableview/tableview.pro
examples/quick/controls/tableview/tableview.qmlproject
+0
-16
examples/quick/controls/tableview/tableview.qmlproject
examples/quick/controls/tableview/tableview.qrc
+0
-0
examples/quick/controls/tableview/tableview.qrc
src/controls/Private/TextHandle.qml
+1
-1
src/controls/Private/TextHandle.qml
src/controls/Private/TextInputWithHandles.qml
+1
-1
src/controls/Private/TextInputWithHandles.qml
src/controls/Private/qquickstyleitem.cpp
+2
-0
src/controls/Private/qquickstyleitem.cpp
src/controls/Slider.qml
+6
-5
src/controls/Slider.qml
src/controls/Styles/Android/ComboBoxStyle.qml
+7
-2
src/controls/Styles/Android/ComboBoxStyle.qml
with
460 additions
and
413 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