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
1dae18be
Commit
1dae18be
authored
11 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I20eae5c8afd58b67e2b7885d8c1977c44ee9a550
parents
a553081b
0155e083
Changes
81
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/quick/controls/gallery/content/Controls.qml
+8
-0
examples/quick/controls/gallery/content/Controls.qml
examples/quick/controls/gallery/content/Layouts.qml
+0
-1
examples/quick/controls/gallery/content/Layouts.qml
examples/quick/controls/gallery/content/Styles.qml
+117
-112
examples/quick/controls/gallery/content/Styles.qml
examples/quick/controls/gallery/main.qml
+92
-129
examples/quick/controls/gallery/main.qml
examples/quick/controls/splitview/main.qml
+0
-8
examples/quick/controls/splitview/main.qml
examples/quick/controls/text/qml/ToolBarSeparator.qml
+61
-0
examples/quick/controls/text/qml/ToolBarSeparator.qml
examples/quick/controls/text/qml/main.qml
+43
-34
examples/quick/controls/text/qml/main.qml
examples/quick/controls/text/resources.qrc
+1
-0
examples/quick/controls/text/resources.qrc
examples/quick/controls/text/src/documenthandler.cpp
+4
-8
examples/quick/controls/text/src/documenthandler.cpp
examples/quick/controls/text/text.pro
+2
-1
examples/quick/controls/text/text.pro
examples/quick/controls/touch/content/ButtonPage.qml
+1
-1
examples/quick/controls/touch/content/ButtonPage.qml
examples/quick/controls/touch/main.qml
+6
-6
examples/quick/controls/touch/main.qml
src/controls/ComboBox.qml
+9
-3
src/controls/ComboBox.qml
src/controls/GroupBox.qml
+3
-1
src/controls/GroupBox.qml
src/controls/ProgressBar.qml
+1
-1
src/controls/ProgressBar.qml
src/controls/ScrollView.qml
+2
-2
src/controls/ScrollView.qml
src/controls/Slider.qml
+0
-13
src/controls/Slider.qml
src/controls/SpinBox.qml
+14
-5
src/controls/SpinBox.qml
src/controls/SplitView.qml
+45
-28
src/controls/SplitView.qml
src/controls/StackView.qml
+14
-3
src/controls/StackView.qml
with
423 additions
and
356 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