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
d079900f
Commit
d079900f
authored
6 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.12 into 5.12.0
Change-Id: Id0c2b7c9606308b3aa601937e4baa1015b26e1aa
parents
349d24b1
68b1be94
dev
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
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
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
No related merge requests found
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/config/qtdoc.qdocconf
+2
-2
doc/config/qtdoc.qdocconf
doc/snippets/qmlapp/usecases/animations.qml
+9
-13
doc/snippets/qmlapp/usecases/animations.qml
doc/snippets/qmlapp/usecases/integratingjs-inline.qml
+3
-4
doc/snippets/qmlapp/usecases/integratingjs-inline.qml
doc/snippets/qmlapp/usecases/integratingjs.qml
+3
-4
doc/snippets/qmlapp/usecases/integratingjs.qml
doc/src/examples.qdoc
+1
-1
doc/src/examples.qdoc
doc/src/external-resources.qdoc
+6
-2
doc/src/external-resources.qdoc
doc/src/getting-started/controls-texteditor.qdoc
+6
-6
doc/src/getting-started/controls-texteditor.qdoc
doc/src/howtos/appicon.qdoc
+8
-0
doc/src/howtos/appicon.qdoc
doc/src/howtos/scalabilityintro.qdoc
+2
-2
doc/src/howtos/scalabilityintro.qdoc
doc/src/legal/bsd.qdoc
+37
-0
doc/src/legal/bsd.qdoc
doc/src/legal/licenses.qdoc
+3
-0
doc/src/legal/licenses.qdoc
doc/src/legal/opensourcelicense.qdoc
+3
-2
doc/src/legal/opensourcelicense.qdoc
doc/src/platforms/emb-linux.qdoc
+1
-3
doc/src/platforms/emb-linux.qdoc
doc/src/platforms/qnx.qdoc
+1
-1
doc/src/platforms/qnx.qdoc
doc/src/platforms/webgl.qdoc
+13
-14
doc/src/platforms/webgl.qdoc
doc/src/qmlapp/applicationdevelopers.qdoc
+2
-2
doc/src/qmlapp/applicationdevelopers.qdoc
doc/src/qmlapp/firststepsqml.qdoc
+1
-1
doc/src/qmlapp/firststepsqml.qdoc
doc/src/qmlapp/usecases/styling.qdoc
+12
-10
doc/src/qmlapp/usecases/styling.qdoc
doc/src/qtmodules.qdoc
+7
-0
doc/src/qtmodules.qdoc
doc/src/snippets/code/doc_src_bsd.qdoc
+56
-0
doc/src/snippets/code/doc_src_bsd.qdoc
with
176 additions
and
67 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