From a1f4a821fc068958621c4d1aad5a366e77c46399 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Tue, 5 Feb 2013 19:27:37 +0100
Subject: [PATCH] Nokia -> Qt Project

Change-Id: Iadd29ee918dc181d2a468f5198e66351c7cb3548
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 .../doc/snippets/code/src_gui_painting_qpainter.cpp  |  2 +-
 src/network/kernel/qurlinfo.cpp                      |  2 +-
 src/tools/qdoc/doc/qdoc-manual.qdoc                  | 12 ++++++------
 util/lexgen/README                                   |  2 +-
 4 files changed, 9 insertions(+), 9 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 79cef3b5ef9..6a012879d41 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 db5105a52bb..89d48639cf2 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 f157f0a2d98..acf3b341532 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
 
diff --git a/util/lexgen/README b/util/lexgen/README
index 9feb18d1e36..435c7f31ee0 100644
--- a/util/lexgen/README
+++ b/util/lexgen/README
@@ -13,4 +13,4 @@ Use at your own risk ;-)
 
 
 --
-Simon Hausmann <simon.hausmann@nokia.com>
+Simon Hausmann <simon.hausmann@digia.com>