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
d3ec09c1
Commit
d3ec09c1
authored
12 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
parents
6afde37f
98cbd8ba
Changes
45
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
LGPL_EXCEPTION.txt
+22
-0
LGPL_EXCEPTION.txt
LICENSE.FDL
+450
-0
LICENSE.FDL
LICENSE.GPL
+674
-0
LICENSE.GPL
LICENSE.LGPL
+514
-0
LICENSE.LGPL
dist/changes-5.0.1
+17
-5
dist/changes-5.0.1
src/assistant/assistant/assistant.pro
+3
-3
src/assistant/assistant/assistant.pro
src/assistant/assistant/centralwidget.h
+10
-6
src/assistant/assistant/centralwidget.h
src/assistant/assistant/doc/qtassistant.qdocconf
+3
-3
src/assistant/assistant/doc/qtassistant.qdocconf
src/assistant/assistant/mainwindow.cpp
+6
-10
src/assistant/assistant/mainwindow.cpp
src/assistant/assistant/mainwindow.h
+1
-1
src/assistant/assistant/mainwindow.h
src/assistant/assistant/openpagesmanager.cpp
+8
-0
src/assistant/assistant/openpagesmanager.cpp
src/assistant/assistant/openpagesmanager.h
+7
-0
src/assistant/assistant/openpagesmanager.h
src/assistant/assistant/openpagesmodel.h
+6
-2
src/assistant/assistant/openpagesmodel.h
src/assistant/help/doc/qthelp.qdocconf
+6
-6
src/assistant/help/doc/qthelp.qdocconf
src/assistant/help/doc/src/qthelp.qdoc
+12
-10
src/assistant/help/doc/src/qthelp.qdoc
src/assistant/qcollectiongenerator/main.cpp
+5
-2
src/assistant/qcollectiongenerator/main.cpp
src/designer/src/components/propertyeditor/previewwidget.ui
+11
-11
src/designer/src/components/propertyeditor/previewwidget.ui
src/designer/src/designer/doc/qtdesigner.qdocconf
+3
-3
src/designer/src/designer/doc/qtdesigner.qdocconf
src/designer/src/designer/doc/src/designer-manual.qdoc
+1
-1
src/designer/src/designer/doc/src/designer-manual.qdoc
src/designer/src/designer/qdesigner_workbench.cpp
+1
-1
src/designer/src/designer/qdesigner_workbench.cpp
with
1760 additions
and
64 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