Nokia -> Qt Project

Change-Id: Iadd29ee918dc181d2a468f5198e66351c7cb3548
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Frederik Gladhorn 2013-02-05 19:27:37 +01:00 committed by The Qt Project
parent d7cad756ef
commit a1f4a821fc
4 changed files with 9 additions and 9 deletions

View File

@ -213,7 +213,7 @@ painter.drawPixmap(target, image, source);
//! [17]
QPainter painter(this);
painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nNokia"));
painter.drawText(rect, Qt::AlignCenter, tr("Qt\nProject"));
//! [17]

View File

@ -217,7 +217,7 @@ QUrlInfo::QUrlInfo(const QUrl &url, int permissions, const QString &owner,
/*!
Sets the name of the URL to \a name. The name is the full text,
for example, "http://qt.nokia.com/doc/qurlinfo.html".
for example, "http://qt-project.org/doc/qt-5.0/qtcore/qurl.html".
If you call this function for an invalid URL info, this function
turns it into a valid one.

View File

@ -4061,10 +4061,10 @@
<shortdesc>the QWidget class is the base class of all user interface objects.</shortdesc>
<prolog>
<author>Qt Development Frameworks</author>
<publisher>Nokia</publisher>
<publisher>Qt Project</publisher>
<copyright>
<copyryear year="2011"/>
<copyrholder>Nokia</copyrholder>
<copyryear year="2013"/>
<copyrholder>Qt Project</copyrholder>
</copyright>
<permissions view="all"/>
<metadata>
@ -7313,9 +7313,9 @@
\code
dita.metadata.default.author = Qt Development Frameworks
dita.metadata.default.permissions = all
dita.metadata.default.publisher = Nokia
dita.metadata.default.copyryear = 2011
dita.metadata.default.copyrholder = Nokia
dita.metadata.default.publisher = Qt Project
dita.metadata.default.copyryear = 2013
dita.metadata.default.copyrholder = Qt Project
dita.metadata.default.audience = programmer
\endcode

View File

@ -13,4 +13,4 @@ Use at your own risk ;-)
--
Simon Hausmann <simon.hausmann@nokia.com>
Simon Hausmann <simon.hausmann@digia.com>