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
e08cbb3d
Commit
e08cbb3d
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I10a73c7f3011e8d9ee40d9b19be3a7d463515bda
parents
0068e353
86008622
No related merge requests found
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
doc/src/images/qt5_everywhere_demo.jpg
+0
-0
doc/src/images/qt5_everywhere_demo.jpg
doc/src/images/qtpositioning_weatherinfo_ex.jpg
+0
-0
doc/src/images/qtpositioning_weatherinfo_ex.jpg
doc/src/images/qtquickcontrols-example-gallery-android.png
+0
-0
doc/src/images/qtquickcontrols-example-gallery-android.png
doc/src/images/qtquickcontrols-example-gallery-osx.png
+0
-0
doc/src/images/qtquickcontrols-example-gallery-osx.png
doc/src/images/qtquickcontrols-example-gallery.jpg
+0
-0
doc/src/images/qtquickcontrols-example-gallery.jpg
doc/src/images/qtsensors_accelbubble_ex.jpg
+0
-0
doc/src/images/qtsensors_accelbubble_ex.jpg
doc/src/images/qtwebengine_quicknanobrowser.jpg
+0
-0
doc/src/images/qtwebengine_quicknanobrowser.jpg
doc/src/images/quick_controls_touch_ex.jpg
+0
-0
doc/src/images/quick_controls_touch_ex.jpg
doc/src/legal/3rdparty.qdoc
+131
-1
doc/src/legal/3rdparty.qdoc
doc/src/legal/licenses.qdoc
+9
-55
doc/src/legal/licenses.qdoc
doc/src/qt5-intro.qdoc
+156
-75
doc/src/qt5-intro.qdoc
with
296 additions
and
131 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