1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into stable

Browse Source 
Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32
This commit is contained in:
Frederik Gladhorn 2013-01-22 18:32:13 +01:00
commit 6bf6c12854
8 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/changes-5.0.1 vendored
View File

@ -22,6 +22,13 @@ information about a particular change.
General Improvements
--------------------
- Documentation:
- Moved documentation under the correct module, fixed module identifiers
- Cleanup of examples and their documentation
- [QTBUG-28579] Fixed broken links to C++ class reference and examples
for a number of modules in Qt Creator Help contents
- Fixed incorrect or missing links, typos
Third party components
----------------------

2
doc/global/qt-html-templates-offline.qdocconf
View File

@ -39,7 +39,7 @@ HTML.footer = \
"</div>\n" \
"<div class=\"footer\">\n" \
" <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia Plc and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \
" <br />\n" \

2
doc/global/qt-html-templates-online.qdocconf
View File

@ -54,7 +54,7 @@ HTML.footer = \
"</div>\n" \
"<div class=\"footer\">\n" \
" <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2012 Digia Plc and/or its\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia Plc and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \
" <br />\n" \

2
doc/global/qt-module-defaults-online.qdocconf
View File

@ -7,7 +7,7 @@ include(compat.qdocconf)
dita.metadata.default.author = Qt Project
dita.metadata.default.permissions = all
dita.metadata.default.publisher = Qt Project
dita.metadata.default.copyryear = 2012
dita.metadata.default.copyryear = 2013
dita.metadata.default.copyrholder = Digia Plc
dita.metadata.default.audience = programmer

2
doc/global/qt-module-defaults.qdocconf
View File

@ -7,7 +7,7 @@ include(compat.qdocconf)
dita.metadata.default.author = Qt Project
dita.metadata.default.permissions = all
dita.metadata.default.publisher = Qt Project
dita.metadata.default.copyryear = 2012
dita.metadata.default.copyryear = 2013
dita.metadata.default.copyrholder = Digia Plc
dita.metadata.default.audience = programmer

2
examples/opengl/cube/main.cpp
View File

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
app.setApplicationName("cube");
app.setApplicationVersion("0.1");
#ifdef QT_NO_OPENGL
#ifndef QT_NO_OPENGL
MainWidget widget;
widget.show();
#else

2
src/corelib/doc/qtcore.qdocconf
View File

@ -37,6 +37,6 @@ exampledirs += \
snippets \
../../../examples/threads/ \
../../../examples/tools/ \
../../../examples/widgets/widgets/analogclock
../../../examples/widgets/
imagedirs += images

8
src/gui/doc/src/coordsys.qdoc
View File

@ -230,7 +230,7 @@
\row
\li {2,1}
\snippet gui/analogclock/main.cpp 1
\snippet analogclock/main.cpp 1
We translate the coordinate system so that point (0, 0) is in the
widget's center, instead of being at the top-left corner. We also
@ -244,7 +244,7 @@
See also the \l {Window-Viewport Conversion} section.
\snippet gui/analogclock/main.cpp 2
\snippet analogclock/main.cpp 2
We draw the clock's hour hand by rotating the coordinate system
and calling QPainter::drawConvexPolygon(). Thank's to the
@ -259,14 +259,14 @@
the code guarantees that the code that follows won't be disturbed
by the transformations we've used.
\snippet gui/analogclock/main.cpp 3
\snippet analogclock/main.cpp 3
We do the same for the clock's minute hand, which is defined by
the four points (1, 0), (0, 1), (-1, 0), and (0, -40). These
coordinates specify a hand that is thinner and longer than the
minute hand.
\snippet gui/analogclock/main.cpp 4
\snippet analogclock/main.cpp 4
Finally, we draw the clock face, which consists of twelve short
lines at 30-degree intervals. At the end of that, the painter is