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
QtTools
Commits
7cc1af65
Commit
7cc1af65
authored
12 years ago
by
Sergio Ahumada
Browse files
Options
Download
Plain Diff
Merge branch 'stable' into release
Change-Id: Idb96b903fb08ad6fcd8fad4ba139bab27c8554da
parents
20a88228
a12d28c0
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.gitignore
+3
-0
.gitignore
dist/changes-5.0.1
+59
-0
dist/changes-5.0.1
examples/assistant/remotecontrol/remotecontrol.cpp
+2
-2
examples/assistant/remotecontrol/remotecontrol.cpp
examples/assistant/remotecontrol/remotecontrol.pro
+1
-1
examples/assistant/remotecontrol/remotecontrol.pro
examples/designer/arthurplugin/arthurplugin.pro
+1
-1
examples/designer/arthurplugin/arthurplugin.pro
examples/examples.pro
+1
-1
examples/examples.pro
src/assistant/assistant/assistant.pro
+3
-3
src/assistant/assistant/assistant.pro
src/assistant/assistant/doc/qtassistant.qdocconf
+2
-2
src/assistant/assistant/doc/qtassistant.qdocconf
src/assistant/clucene/qclucene_global_p.h
+4
-3
src/assistant/clucene/qclucene_global_p.h
src/assistant/help/doc/qthelp.qdocconf
+4
-4
src/assistant/help/doc/qthelp.qdocconf
src/assistant/help/qhelpsearchengine.h
+2
-2
src/assistant/help/qhelpsearchengine.h
src/designer/src/designer/assistantclient.cpp
+2
-2
src/designer/src/designer/assistantclient.cpp
src/designer/src/designer/designer.pro
+1
-1
src/designer/src/designer/designer.pro
src/designer/src/designer/doc/qtdesigner.qdocconf
+1
-1
src/designer/src/designer/doc/qtdesigner.qdocconf
src/designer/src/lib/shared/qlayout_widget.cpp
+2
-0
src/designer/src/lib/shared/qlayout_widget.cpp
src/designer/src/plugins/plugins.pro
+2
-2
src/designer/src/plugins/plugins.pro
src/designer/src/uitools/doc/qtuitools.qdocconf
+4
-4
src/designer/src/uitools/doc/qtuitools.qdocconf
src/linguist/linguist.pro
+1
-1
src/linguist/linguist.pro
src/linguist/linguist/doc/qtlinguist.qdocconf
+2
-2
src/linguist/linguist/doc/qtlinguist.qdocconf
src/linguist/linguist/linguist.pro
+1
-1
src/linguist/linguist/linguist.pro
with
98 additions
and
33 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