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
QtDoc
Commits
736a41c0
Commit
736a41c0
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1c8dd12e37606df62c6ac30916caeb20044e082e
parents
0c53ccbf
cc1a7a75
dev
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
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
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
No related merge requests found
Changes
28
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/src/modules.qdoc
+70
-0
doc/src/modules.qdoc
examples/demos/calqlatr/calqlatr.pro
+1
-2
examples/demos/calqlatr/calqlatr.pro
examples/demos/calqlatr/main.cpp
+22
-2
examples/demos/calqlatr/main.cpp
examples/demos/clocks/main.cpp
+22
-2
examples/demos/clocks/main.cpp
examples/demos/maroon/main.cpp
+22
-2
examples/demos/maroon/main.cpp
examples/demos/rssnews/main.cpp
+22
-2
examples/demos/rssnews/main.cpp
examples/demos/samegame/main.cpp
+22
-2
examples/demos/samegame/main.cpp
examples/demos/shared/Button.qml
+0
-96
examples/demos/shared/Button.qml
examples/demos/shared/CheckBox.qml
+0
-107
examples/demos/shared/CheckBox.qml
examples/demos/shared/Label.qml
+0
-56
examples/demos/shared/Label.qml
examples/demos/shared/LauncherList.qml
+0
-252
examples/demos/shared/LauncherList.qml
examples/demos/shared/README
+0
-11
examples/demos/shared/README
examples/demos/shared/SimpleLauncherDelegate.qml
+0
-138
examples/demos/shared/SimpleLauncherDelegate.qml
examples/demos/shared/Slider.qml
+0
-127
examples/demos/shared/Slider.qml
examples/demos/shared/TabSet.qml
+0
-116
examples/demos/shared/TabSet.qml
examples/demos/shared/TextField.qml
+0
-90
examples/demos/shared/TextField.qml
examples/demos/shared/images/back.png
+0
-0
examples/demos/shared/images/back.png
examples/demos/shared/images/checkmark.png
+0
-0
examples/demos/shared/images/checkmark.png
examples/demos/shared/images/next.png
+0
-0
examples/demos/shared/images/next.png
examples/demos/shared/images/qt-logo.png
+0
-0
examples/demos/shared/images/qt-logo.png
with
181 additions
and
1005 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