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
614219ff
Commit
614219ff
authored
11 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Iacbefdc16156f495db756c71dcf6a7f1395c220b
parents
6a13f770
68abb104
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.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
dev
old/5.1
old/5.2
wip/calendar
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
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
No related merge requests found
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/quick/controls/shared/qt_quick_controls_examplemain.h
+2
-9
...les/quick/controls/shared/qt_quick_controls_examplemain.h
examples/quick/controls/text/example.html
+11
-11
examples/quick/controls/text/example.html
examples/quick/controls/text/qml/images/logo32.png
+0
-0
examples/quick/controls/text/qml/images/logo32.png
examples/quick/controls/text/qml/images/qt-logo.png
+0
-0
examples/quick/controls/text/qml/images/qt-logo.png
examples/quick/controls/text/qml/main.qml
+113
-39
examples/quick/controls/text/qml/main.qml
examples/quick/controls/text/resources.qrc
+26
-26
examples/quick/controls/text/resources.qrc
examples/quick/controls/text/src/documenthandler.cpp
+43
-5
examples/quick/controls/text/src/documenthandler.cpp
examples/quick/controls/text/src/documenthandler.h
+10
-6
examples/quick/controls/text/src/documenthandler.h
examples/quick/controls/text/src/main.cpp
+2
-12
examples/quick/controls/text/src/main.cpp
src/controls/StackView.qml
+127
-125
src/controls/StackView.qml
src/controls/TableView.qml
+60
-18
src/controls/TableView.qml
src/layouts/doc/images/rowlayout-minimum.png
+0
-0
src/layouts/doc/images/rowlayout-minimum.png
src/layouts/doc/qtquicklayouts.qdocconf
+2
-0
src/layouts/doc/qtquicklayouts.qdocconf
src/layouts/doc/src/qtquicklayouts-index.qdoc
+10
-0
src/layouts/doc/src/qtquicklayouts-index.qdoc
src/layouts/doc/src/qtquicklayouts-overview.qdoc
+128
-0
src/layouts/doc/src/qtquicklayouts-overview.qdoc
src/layouts/doc/src/snippets/windowconstraints.qml
+89
-0
src/layouts/doc/src/snippets/windowconstraints.qml
src/private/TabBar.qml
+0
-2
src/private/TabBar.qml
tests/auto/controls/data/tableview/table_activated.qml
+14
-3
tests/auto/controls/data/tableview/table_activated.qml
tests/auto/controls/data/tst_tableview.qml
+51
-2
tests/auto/controls/data/tst_tableview.qml
tests/auto/controls/data/tst_tabview.qml
+1
-1
tests/auto/controls/data/tst_tabview.qml
with
689 additions
and
259 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