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
80e30b82
Commit
80e30b82
authored
9 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I16896bc92194fc9fd47c6cb9f2292229cc7288be
parents
5bbd2402
ee02a2d8
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
LICENSE.GPLv3
+686
-0
LICENSE.GPLv3
LICENSE.LGPLv3
+2
-0
LICENSE.LGPLv3
doc/src/platforms/emb-linux.qdoc
+5
-0
doc/src/platforms/emb-linux.qdoc
doc/src/platforms/supported-platforms.qdoc
+1
-1
doc/src/platforms/supported-platforms.qdoc
doc/src/qmlapp/usecases/integratingjs.qdoc
+1
-1
doc/src/qmlapp/usecases/integratingjs.qdoc
with
695 additions
and
2 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