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
effeb8fd
Commit
effeb8fd
authored
8 years ago
by
Liang Qi
Committed by
The Qt Project
8 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
parents
2c5e9c58
99e899a6
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/config/style/qt5-sidebar.html
+1
-1
doc/config/style/qt5-sidebar.html
doc/src/external-resources.qdoc
+0
-8
doc/src/external-resources.qdoc
doc/src/howtos/scalabilityintro.qdoc
+3
-3
doc/src/howtos/scalabilityintro.qdoc
doc/src/images/qt-creator-gs.png
+0
-0
doc/src/images/qt-creator-gs.png
doc/src/legal/3rdparty.qdoc
+23
-0
doc/src/legal/3rdparty.qdoc
doc/src/legal/licenses.qdoc
+14
-0
doc/src/legal/licenses.qdoc
doc/src/platforms/emb-linux.qdoc
+14
-0
doc/src/platforms/emb-linux.qdoc
doc/src/platforms/linux.qdoc
+2
-9
doc/src/platforms/linux.qdoc
doc/src/platforms/platform-notes-android.qdoc
+2
-7
doc/src/platforms/platform-notes-android.qdoc
doc/src/platforms/supported-platforms.qdoc
+4
-0
doc/src/platforms/supported-platforms.qdoc
doc/src/platforms/windows.qdoc
+68
-159
doc/src/platforms/windows.qdoc
doc/src/qmlapp/applicationdevelopers.qdoc
+1
-1
doc/src/qmlapp/applicationdevelopers.qdoc
doc/src/qmlapp/usecases/animations.qdoc
+2
-2
doc/src/qmlapp/usecases/animations.qdoc
doc/src/qt5-intro.qdoc
+1
-1
doc/src/qt5-intro.qdoc
doc/src/reference.qdoc
+1
-7
doc/src/reference.qdoc
doc/src/snippets/code/doc_src_deployment.cpp
+4
-4
doc/src/snippets/code/doc_src_deployment.cpp
doc/src/snippets/code/doc_src_deployment.qdoc
+1
-1
doc/src/snippets/code/doc_src_deployment.qdoc
doc/src/snippets/code/doc_src_i18n.cpp
+4
-4
doc/src/snippets/code/doc_src_i18n.cpp
doc/src/snippets/code/doc_src_linguist-manual.cpp
+3
-3
doc/src/snippets/code/doc_src_linguist-manual.cpp
doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp
+1
-1
doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp
with
149 additions
and
211 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