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
8c095bef
Commit
8c095bef
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: I89485110baf91c367b448fd1e913e02fe29345a7
parents
ae17ded4
3361d004
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
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
dist/changes-5.12.0
+30
-0
dist/changes-5.12.0
doc/config/qtdoc.qdocconf
+2
-2
doc/config/qtdoc.qdocconf
doc/images/qmlapp/qml-extending-types.png
+0
-0
doc/images/qmlapp/qml-extending-types.png
doc/snippets/qmlapp/qml-extending-types/components/MessageLabel.qml
+28
-6
...ts/qmlapp/qml-extending-types/components/MessageLabel.qml
doc/snippets/qmlapp/qml-extending-types/components/application.qml
+22
-4
...ets/qmlapp/qml-extending-types/components/application.qml
doc/src/external-resources.qdoc
+4
-0
doc/src/external-resources.qdoc
doc/src/legal/licensechanges.qdoc
+76
-0
doc/src/legal/licensechanges.qdoc
doc/src/platforms/android.qdoc
+3
-1
doc/src/platforms/android.qdoc
doc/src/platforms/qnx.qdoc
+214
-161
doc/src/platforms/qnx.qdoc
doc/src/platforms/supported-platforms.qdocinc
+17
-15
doc/src/platforms/supported-platforms.qdocinc
doc/src/platforms/windows.qdoc
+2
-2
doc/src/platforms/windows.qdoc
doc/src/platforms/winrt.qdoc
+20
-14
doc/src/platforms/winrt.qdoc
doc/src/qmlapp/firststepsqml.qdoc
+20
-17
doc/src/qmlapp/firststepsqml.qdoc
doc/src/qt5-intro.qdoc
+1
-0
doc/src/qt5-intro.qdoc
doc/src/qtmodules.qdoc
+17
-11
doc/src/qtmodules.qdoc
doc/src/whatsnew/whatsnew512.qdoc
+4
-5
doc/src/whatsnew/whatsnew512.qdoc
with
460 additions
and
238 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