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
QtBase
Commits
0d02a065
Commit
0d02a065
authored
10 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4' into 5.4.0
Change-Id: I85e3dfa62f217b76447276dd7cce6b9eac3a144e
parents
d7a5dc0c
ba73bde6
No related merge requests found
Changes
100
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/global/externalsites/qtcreator.qdoc
+12
-0
doc/global/externalsites/qtcreator.qdoc
doc/global/template/images/Qt-logo.png
+0
-0
doc/global/template/images/Qt-logo.png
doc/global/template/images/logo.png
+0
-0
doc/global/template/images/logo.png
doc/global/template/images/sprites-combined.png
+0
-0
doc/global/template/images/sprites-combined.png
doc/global/template/style/offline.css
+0
-1
doc/global/template/style/offline.css
examples/opengl/legacy/framebufferobject2/cubelogo.png
+0
-0
examples/opengl/legacy/framebufferobject2/cubelogo.png
examples/opengl/legacy/pbuffers/cubelogo.png
+0
-0
examples/opengl/legacy/pbuffers/cubelogo.png
examples/sql/doc/images/drilldown-example.png
+0
-0
examples/sql/doc/images/drilldown-example.png
examples/sql/drilldown/images/qt-creator.png
+0
-0
examples/sql/drilldown/images/qt-creator.png
examples/sql/drilldown/images/qt-logo.png
+0
-0
examples/sql/drilldown/images/qt-logo.png
examples/sql/drilldown/images/qt-project.png
+0
-0
examples/sql/drilldown/images/qt-project.png
examples/sql/drilldown/images/qt-quick.png
+0
-0
examples/sql/drilldown/images/qt-quick.png
examples/widgets/animation/animatedtiles/images/kinetic.png
+0
-0
examples/widgets/animation/animatedtiles/images/kinetic.png
examples/widgets/animation/easing/images/qt-logo.png
+0
-0
examples/widgets/animation/easing/images/qt-logo.png
examples/widgets/doc/images/dropsite-example.png
+0
-0
examples/widgets/doc/images/dropsite-example.png
examples/widgets/doc/images/icons_qt_extended_16x16.png
+0
-0
examples/widgets/doc/images/icons_qt_extended_16x16.png
examples/widgets/doc/images/icons_qt_extended_17x17.png
+0
-0
examples/widgets/doc/images/icons_qt_extended_17x17.png
examples/widgets/doc/images/icons_qt_extended_32x32.png
+0
-0
examples/widgets/doc/images/icons_qt_extended_32x32.png
examples/widgets/doc/images/icons_qt_extended_33x33.png
+0
-0
examples/widgets/doc/images/icons_qt_extended_33x33.png
examples/widgets/doc/images/icons_qt_extended_48x48.png
+0
-0
examples/widgets/doc/images/icons_qt_extended_48x48.png
with
12 additions
and
1 deletion
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