diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 19:27:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-05 20:53:57 +0100 |
| commit | a1f4a821fc068958621c4d1aad5a366e77c46399 (patch) | |
| tree | b7b8075c35ba6235c48e3e760aeb48909a53df43 /src | |
| parent | d7cad756efc89281f0294fec4ce84df1188c8aad (diff) | |
Nokia -> Qt Project
Change-Id: Iadd29ee918dc181d2a468f5198e66351c7cb3548
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qurlinfo.cpp | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/qdoc-manual.qdoc | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp index 79cef3b5ef..6a012879d4 100644 --- a/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp +++ b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp @@ -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] diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp index db5105a52b..89d48639cf 100644 --- a/src/network/kernel/qurlinfo.cpp +++ b/src/network/kernel/qurlinfo.cpp @@ -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. diff --git a/src/tools/qdoc/doc/qdoc-manual.qdoc b/src/tools/qdoc/doc/qdoc-manual.qdoc index f157f0a2d9..acf3b34153 100644 --- a/src/tools/qdoc/doc/qdoc-manual.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual.qdoc @@ -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 |