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
QtDoc
Commits
68b1be94
Commit
68b1be94
authored
6 years ago
by
Liang Qi
Committed by
The Qt Project
6 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
parents
11e2c7e4
4dd9e8b5
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
doc/src/external-resources.qdoc
+6
-2
doc/src/external-resources.qdoc
doc/src/howtos/appicon.qdoc
+8
-0
doc/src/howtos/appicon.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/qnx.qdoc
+1
-1
doc/src/platforms/qnx.qdoc
doc/src/snippets/code/doc_src_bsd.qdoc
+56
-0
doc/src/snippets/code/doc_src_bsd.qdoc
doc/src/web-content.qdoc
+4
-4
doc/src/web-content.qdoc
doc/src/whatsnew/whatsnew50.qdoc
+1
-1
doc/src/whatsnew/whatsnew50.qdoc
with
119 additions
and
10 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
