From 3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 11 Aug 2009 19:43:41 +1000
Subject: Eliminate some mentions of Trolltech.

Reviewed-by: Trust Me
---
 bin/syncqt                                         |  2 +-
 configure                                          | 14 ++--
 demos/browser/browserapplication.cpp               |  2 +-
 demos/browser/htmls/notfound.html                  |  4 +-
 demos/embedded/fluidlauncher/pictureflow.cpp       | 74 +++++++++++-----------
 demos/embedded/styledemo/main.cpp                  |  4 +-
 demos/mediaplayer/main.cpp                         |  4 +-
 demos/qtdemo/mainwindow.cpp                        | 14 ++--
 demos/qtdemo/mainwindow.h                          |  2 +-
 dist/README                                        |  2 +-
 dist/changes-3.0.0                                 |  4 +-
 dist/changes-3.0.0-beta1                           |  5 +-
 dist/changes-4.3.0                                 |  2 +-
 dist/changes-4.3.2                                 |  4 +-
 dist/changes-4.3.3                                 |  2 +-
 dist/changes-4.4.0                                 |  4 +-
 dist/changes-4.4.1                                 |  2 +-
 dist/changes-4.4.2                                 |  2 +-
 dist/changes-4.4.3                                 |  2 +-
 doc/src/codecs.qdoc                                | 16 ++---
 doc/src/designer-manual.qdoc                       |  4 +-
 doc/src/emb-porting.qdoc                           |  2 +-
 doc/src/porting4-obsoletedmechanism.qdocinc        |  2 +-
 doc/src/qmsdev.qdoc                                |  2 +-
 .../snippets/code/src_corelib_tools_qbytearray.cpp |  8 +--
 .../snippets/code/src_gui_painting_qpainter.cpp    |  2 +-
 doc/src/snippets/qstring/main.cpp                  |  4 +-
 examples/opengl/hellogl/glwidget.cpp               | 10 +--
 examples/opengl/hellogl/glwidget.h                 |  4 +-
 examples/opengl/overpainting/glwidget.cpp          | 14 ++--
 examples/opengl/overpainting/glwidget.h            |  4 +-
 examples/opengl/samplebuffers/glwidget.cpp         |  6 +-
 .../tools/customcompleter/resources/wordlist.txt   |  1 -
 examples/xml/dombookmarks/jennifer.xbel            |  2 +-
 examples/xml/saxbookmarks/jennifer.xbel            |  2 +-
 examples/xml/streambookmarks/jennifer.xbel         |  2 +-
 .../xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h  |  2 +-
 src/corelib/codecs/qtsciicodec.cpp                 |  2 +-
 src/corelib/codecs/qtsciicodec_p.h                 |  2 +-
 src/corelib/global/qglobal.h                       |  2 +-
 src/gui/itemviews/qdatawidgetmapper.cpp            | 22 +++----
 src/gui/kernel/qmotifdnd_x11.cpp                   |  2 +-
 src/network/access/qftp.cpp                        |  2 +-
 src/network/access/qhttp.cpp                       |  3 +-
 src/network/ssl/qsslconfiguration.h                |  2 +-
 src/network/ssl/qsslconfiguration_p.h              |  2 +-
 src/plugins/codecs/jp/qeucjpcodec.cpp              |  2 +-
 src/plugins/codecs/jp/qeucjpcodec.h                |  2 +-
 src/plugins/codecs/jp/qjiscodec.cpp                |  2 +-
 src/plugins/codecs/jp/qjiscodec.h                  |  2 +-
 src/plugins/codecs/jp/qjpunicode.h                 |  2 +-
 src/plugins/codecs/jp/qsjiscodec.cpp               |  2 +-
 src/plugins/codecs/jp/qsjiscodec.h                 |  2 +-
 src/plugins/codecs/kr/qeuckrcodec.cpp              |  4 +-
 src/plugins/codecs/tw/qbig5codec.h                 |  2 +-
 tools/qvfb/qtopiakeysym.h                          |  5 +-
 tools/qvfb/qvfbx11view.cpp                         |  5 +-
 tools/qvfb/qvfbx11view.h                           |  5 +-
 tools/qvfb/x11keyfaker.cpp                         |  5 +-
 tools/qvfb/x11keyfaker.h                           |  5 +-
 tools/xmlpatterns/main.cpp                         |  4 +-
 tools/xmlpatterns/main.h                           | 21 +++---
 tools/xmlpatterns/qcoloringmessagehandler_p.h      | 21 +++---
 tools/xmlpatterns/qcoloroutput.cpp                 | 21 +++---
 tools/xmlpatterns/qcoloroutput_p.h                 | 21 +++---
 util/lexgen/README                                 |  2 +-
 util/qlalr/compress.cpp                            |  2 +-
 util/qlalr/compress.h                              |  2 +-
 util/qlalr/cppgenerator.cpp                        |  2 +-
 util/qlalr/cppgenerator.h                          |  2 +-
 util/qlalr/dotgraph.cpp                            |  2 +-
 util/qlalr/dotgraph.h                              |  2 +-
 util/qlalr/grammar.cpp                             |  2 +-
 util/qlalr/grammar_p.h                             |  2 +-
 util/qlalr/lalr.cpp                                |  2 +-
 util/qlalr/lalr.g                                  |  6 +-
 util/qlalr/lalr.h                                  |  2 +-
 util/qlalr/main.cpp                                |  2 +-
 util/qlalr/parsetable.cpp                          |  2 +-
 util/qlalr/parsetable.h                            |  2 +-
 util/qlalr/recognizer.cpp                          |  3 +-
 util/qlalr/recognizer.h                            |  2 +-
 82 files changed, 229 insertions(+), 218 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index d6d3c57..a3addd8 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 ######################################################################
 #
-# Synchronizes Qt header files - internal Trolltech tool.
+# Synchronizes Qt header files - internal Qt development tool.
 #
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # Contact: Nokia Corporation (qt-info@nokia.com)
diff --git a/configure b/configure
index b5baadb..7af8487 100755
--- a/configure
+++ b/configure
@@ -400,7 +400,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
             echo
             echo "You are not licensed for Qt for Embedded Linux."
             echo
-            echo "Please contact sales@trolltech.com to upgrade your license"
+            echo "Please contact qt-info@nokia.com to upgrade your license"
             echo "to include Qt for Embedded Linux, or install the"
             echo "Qt Open Source Edition if you intend to develop free software."
             exit 1
@@ -420,7 +420,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
             echo
             echo "You are not licensed for the Qt/Mac platform."
             echo
-            echo "Please contact sales@trolltech.com to upgrade your license"
+            echo "Please contact qt-info@nokia.com to upgrade your license"
             echo "to include the Qt/Mac platform."
             exit 1
             ;;
@@ -439,7 +439,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
              echo
              echo "You are not licensed for the Qt/X11 platform."
              echo
-             echo "Please contact sales@trolltech.com to upgrade your license to"
+             echo "Please contact qt-info@nokia.com to upgrade your license to"
              echo "include the Qt/X11 platform, or install the Qt Open Source Edition"
              echo "if you intend to develop free software."
              exit 1
@@ -2890,7 +2890,7 @@ fi
 #prefix
 if [ -z "$QT_INSTALL_PREFIX" ]; then
     if [ "$CFG_DEV" = "yes" ]; then
-	QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default
+	QT_INSTALL_PREFIX="$outpath" # In Qt Development, we use sandboxed builds by default
     elif [ "$PLATFORM_QWS" = "yes" ]; then
         QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"
         if [ "$PLATFORM" != "$XPLATFORM" ]; then
@@ -3792,7 +3792,7 @@ elif [ "$Edition" != "OpenSource" ]; then
                     echo "  Your support and upgrade period has expired."
                     echo
                     echo "  You are no longer licensed to use this version of Qt."
-                    echo "  Please contact sales@trolltech.com to renew your support"
+                    echo "  Please contact qt-info@nokia.com to renew your support"
                     echo "  and upgrades for this license."
                     echo
                     echo "NOTICE  NOTICE  NOTICE  NOTICE"
@@ -3810,7 +3810,7 @@ elif [ "$Edition" != "OpenSource" ]; then
                     echo "  support, nor are you entitled to use any more recent"
                     echo "  Qt releases."
                     echo
-                    echo "  Please contact sales@trolltech.com to renew your"
+                    echo "  Please contact qt-info@nokia.com to renew your"
                     echo "  support and upgrades for this license."
                     echo
                     echo "WARNING  WARNING  WARNING  WARNING"
@@ -3825,7 +3825,7 @@ elif [ "$Edition" != "OpenSource" ]; then
                 echo "  Your Evaluation license has expired."
                 echo
                 echo "  You are no longer licensed to use this software. Please"
-                echo "  contact sales@trolltech.com to purchase license, or install"
+                echo "  contact qt-info@nokia.com to purchase license, or install"
                 echo "  the Qt Open Source Edition if you intend to develop free"
                 echo "  software."
                 echo
diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
index 7a87b33..8262d22 100644
--- a/demos/browser/browserapplication.cpp
+++ b/demos/browser/browserapplication.cpp
@@ -79,7 +79,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv)
     : QApplication(argc, argv)
     , m_localServer(0)
 {
-    QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
+    QCoreApplication::setOrganizationName(QLatin1String("Qt"));
     QCoreApplication::setApplicationName(QLatin1String("demobrowser"));
     QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
 #ifdef Q_WS_QWS
diff --git a/demos/browser/htmls/notfound.html b/demos/browser/htmls/notfound.html
index b04a9f8..e89845a 100644
--- a/demos/browser/htmls/notfound.html
+++ b/demos/browser/htmls/notfound.html
@@ -49,8 +49,8 @@ ul {
     <h1>%2</h1>
     <h2>When connecting to: %3.</h2>
     <ul>
-      <li>Check the address for errors such as <b>ww</b>.trolltech.com
-      instead of <b>www</b>.trolltech.com</li>
+      <li>Check the address for errors such as <b>ww</b>.example.com
+      instead of <b>www</b>.example.com</li>
       <li>If the address is correct, try checking the network
       connection.</li>
       <li>If your computer or network is protected by a firewall or
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index 19661d1..1c4197a 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -1,39 +1,39 @@
 /****************************************************************************
 **
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-* This is version of the Pictureflow animated image show widget modified by Nokia.
-*
-*  $QT_BEGIN_LICENSE:LGPL$
-*  No Commercial Usage
-*  This file contains pre-release code and may not be distributed.
-*  You may use this file in accordance with the terms and conditions
-*  contained in the either Technology Preview License Agreement or the
-*  Beta Release License Agreement.
-* 
-*  GNU Lesser General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU Lesser
-*  General Public License version 2.1 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.LGPL included in the
-*  packaging of this file.  Please review the following information to
-*  ensure the GNU Lesser General Public License version 2.1 requirements
-*  will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-* 
-*  In addition, as a special exception, Nokia gives you certain
-*  additional rights. These rights are described in the Nokia Qt LGPL
-*  Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-*  package.
-* 
-*  GNU General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU
-*  General Public License version 3.0 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.GPL included in the
-*  packaging of this file.  Please review the following information to
-*  ensure the GNU General Public License version 3.0 requirements will be
-*  met: http://www.gnu.org/copyleft/gpl.html.
-* 
-*  If you are unsure which license is appropriate for your use, please
-*  contact the sales department at http://qt.nokia.com/contact.
-*  $QT_END_LICENSE$
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+** This is version of the Pictureflow animated image show widget modified by Nokia.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
 *
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
@@ -57,10 +57,10 @@
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+*
 ****************************************************************************/
 
-/* 
+/*
   ORIGINAL COPYRIGHT HEADER
   PictureFlow - animated image show widget
   http://pictureflow.googlecode.com
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
index 7aab532..7cb6b7f 100644
--- a/demos/embedded/styledemo/main.cpp
+++ b/demos/embedded/styledemo/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(styledemo);
 
     app.setApplicationName("style");
-    app.setOrganizationName("Trolltech");
-    app.setOrganizationDomain("com.trolltech");
+    app.setOrganizationName("Nokia");
+    app.setOrganizationDomain("com.nokia.qt");
 
     StyleWidget widget;
     widget.showFullScreen();
diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
index 8c921fc..8a6d71e 100644
--- a/demos/mediaplayer/main.cpp
+++ b/demos/mediaplayer/main.cpp
@@ -47,9 +47,9 @@ int main (int argc, char *argv[])
     Q_INIT_RESOURCE(mediaplayer);
     QApplication app(argc, argv);
     app.setApplicationName("Media Player");
-    app.setOrganizationName("Trolltech");
+    app.setOrganizationName("Qt");
     app.setQuitOnLastWindowClosed(true);
-    
+
     QString fileString = app.arguments().value(1);
     MediaPlayer player(fileString);
     player.show();
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 1561dda..59715a6 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent) : QGraphicsView(parent), updateTimer(thi
     this->doneAdapt = false;
     this->useTimer = false;
     this->updateTimer.setSingleShot(true);
-    this->trolltechLogo = 0;
+    this->companyLogo = 0;
     this->qtLogo = 0;
     this->setupWidget();
     this->setupScene();
@@ -73,7 +73,7 @@ MainWindow::MainWindow(QWidget *parent) : QGraphicsView(parent), updateTimer(thi
 
 MainWindow::~MainWindow()
 {
-    delete this->trolltechLogo;
+    delete this->companyLogo;
     delete this->qtLogo;
 }
 
@@ -275,9 +275,9 @@ void MainWindow::setupSceneItems()
         this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
     }
 
-    this->trolltechLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+    this->companyLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
     this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, 0, true, 0.5f);
-    this->trolltechLogo->setZValue(100);
+    this->companyLogo->setZValue(100);
     this->qtLogo->setZValue(100);
     this->pausedLabel = new DemoTextItem(QString("PAUSED"), Colors::buttonFont(), Qt::white, -1, this->scene, 0);
     this->pausedLabel->setZValue(100);
@@ -463,10 +463,10 @@ void MainWindow::resizeEvent(QResizeEvent *event)
     QGraphicsView::resizeEvent(event);
     DemoItem::setMatrix(this->matrix());
 
-    if (this->trolltechLogo){
+    if (this->companyLogo){
         const QRectF r = this->scene->sceneRect();
-        QRectF ttb = this->trolltechLogo->boundingRect();
-        this->trolltechLogo->setPos(int((r.width() - ttb.width()) / 2), 595 - ttb.height());
+        QRectF ttb = this->companyLogo->boundingRect();
+        this->companyLogo->setPos(int((r.width() - ttb.width()) / 2), 595 - ttb.height());
         QRectF qtb = this->qtLogo->boundingRect();
         this->qtLogo->setPos(802 - qtb.width(), 0);
     }
diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h
index d8fac1f..634a026 100644
--- a/demos/qtdemo/mainwindow.h
+++ b/demos/qtdemo/mainwindow.h
@@ -98,7 +98,7 @@ private:
     QTime demoStartTime;
     QTime fpsTime;
     QPixmap background;
-    ImageItem *trolltechLogo;
+    ImageItem *companyLogo;
     ImageItem *qtLogo;
     bool doneAdapt;
     bool useTimer;
diff --git a/dist/README b/dist/README
index c941593..770bb79 100644
--- a/dist/README
+++ b/dist/README
@@ -123,7 +123,7 @@ If the problem you are reporting is only visible at run-time, try to
 create a small test program that shows the problem when run. Often,
 such a program can be created with some minor changes to one of the
 many example programs in Qt's examples directory. Please submit the
-bug report using the Task Tracker on the Trolltech website:
+bug report using the Task Tracker on the Qt website:
 
 http://qt.nokia.com/developer/task-tracker
 
diff --git a/dist/changes-3.0.0 b/dist/changes-3.0.0
index 1f6ad5b..4f8776b 100644
--- a/dist/changes-3.0.0
+++ b/dist/changes-3.0.0
@@ -433,8 +433,8 @@ from one single project description. It is the C++ successor of
 'tmake' which required Perl.
 
 qmake offers additional functionallity that is difficult to reproduce
-in tmake. Trolltech uses qmake in its build system for Qt and related
-products and we have released it as free software.
+in tmake. Qt uses qmake in its build system and we have released it
+as free software.
 
 
 
diff --git a/dist/changes-3.0.0-beta1 b/dist/changes-3.0.0-beta1
index 2c73e77..37f4c36 100644
--- a/dist/changes-3.0.0-beta1
+++ b/dist/changes-3.0.0-beta1
@@ -405,9 +405,8 @@ QMake
 
 To ease portability we now provide the qmake utility to replace tmake.
 QMake is a C++ version of tmake which offers additional functionallity
-that is difficult to reproduce in tmake. Trolltech uses qmake in its
-build system for Qt and related products and we have released it as
-free software.
+that is difficult to reproduce in tmake. Qt uses qmake in its build
+system and we have released it as free software.
 
 
 Qt Functions
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
index f4e1d1a..bc0f636 100644
--- a/dist/changes-4.3.0
+++ b/dist/changes-4.3.0
@@ -34,7 +34,7 @@ General Improvements
 - Documentation and Examples
     * Added information about the TS file format used in Linguist.
     * Moved platform and compiler support information from
-      www.trolltech.com into the documentation.
+      Qt website into the documentation.
     * Added an Accessibility overview document.
     * Added new example to show usage of QCompleter with custom tree models.
 
diff --git a/dist/changes-4.3.2 b/dist/changes-4.3.2
index 2bec4e6..ac96a14 100644
--- a/dist/changes-4.3.2
+++ b/dist/changes-4.3.2
@@ -16,7 +16,7 @@ General Improvements
     * This version adds the Academic Free License 3.0, Artistic License 2.0,
       Zope Public License 2.1 and Eclipse Public License to the GPL
       Exception for developers using the Open Source Edition of Qt.
-      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      See the GPL Exception Version 1.1 page in the documentation
       for more information.
 
 Tools
@@ -542,7 +542,7 @@ Mac OS X
       the August Leopard pre-release (build 9A527) will not show any windows
       because of a regression in the Carbon library. This has been addressed
       for a future OS X release. In the meantime, if you *must* test your
-      application against this Leopard build, please contact Trolltech.
+      application against this Leopard build, please contact us.
     * [178551] Fixed a regression that made it impossible to deliver mouse
       move events to other widgets after a double-click on a widget that was
       immediately hidden as a result of the double-click event.
diff --git a/dist/changes-4.3.3 b/dist/changes-4.3.3
index 5bf6da0..7933426 100644
--- a/dist/changes-4.3.3
+++ b/dist/changes-4.3.3
@@ -17,7 +17,7 @@ General Improvements
     * This version adds the Common Development and Distribution License
       (CDDL) to the GPL Exception for developers using the Open Source
       Edition of Qt.
-      See the Trolltech GPL Exception Version 1.1 page in the documentation
+      See the GPL Exception Version 1.1 page in the documentation
       for more information.
     * This version upgrades the Qt Commercial License to version 3.4,
       the Qtopia Core Commercial License to 1.2 and the Qt Academic
diff --git a/dist/changes-4.4.0 b/dist/changes-4.4.0
index 7875f2c..81eb8ab 100644
--- a/dist/changes-4.4.0
+++ b/dist/changes-4.4.0
@@ -11,7 +11,7 @@ run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
@@ -939,7 +939,7 @@ Third party components
       requested.
 
 - QPrintEngine
-    * [193986] Fixed the Trolltech copyright date on PDF files
+    * [193986] Fixed the copyright date on PDF files
 
 - QProcess
     * [162522] QProcess now emits stateChanged() consistently for all state
diff --git a/dist/changes-4.4.1 b/dist/changes-4.4.1
index 4995a86..c009169 100644
--- a/dist/changes-4.4.1
+++ b/dist/changes-4.4.1
@@ -9,7 +9,7 @@ and 4.3 will continue to run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
diff --git a/dist/changes-4.4.2 b/dist/changes-4.4.2
index 192bbd1..c440375 100644
--- a/dist/changes-4.4.2
+++ b/dist/changes-4.4.2
@@ -9,7 +9,7 @@ and 4.3 will continue to run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
diff --git a/dist/changes-4.4.3 b/dist/changes-4.4.3
index f33cede..5b7bef7 100644
--- a/dist/changes-4.4.3
+++ b/dist/changes-4.4.3
@@ -10,7 +10,7 @@ and 4.3 will continue to run with 4.4.
 Some of the changes listed in this file include issue tracking numbers
 corresponding to tasks in the Task Tracker:
 
-  http://www.trolltech.com/developer/task-tracker
+  http://qt.nokia.com/developer/task-tracker
 
 Each of these identifiers can be entered in the task tracker to obtain
 more information about a particular change.
diff --git a/doc/src/codecs.qdoc b/doc/src/codecs.qdoc
index fc212df..7359b79 100644
--- a/doc/src/codecs.qdoc
+++ b/doc/src/codecs.qdoc
@@ -48,7 +48,7 @@
     The code was originally contributed by Ming-Che Chuang
     \<mingche@cobra.ee.ntu.edu.tw\> for the Big-5+ encoding, and was
     included in Qt with the author's permission, and the grateful
-    thanks of the Trolltech team. (Note: Ming-Che's code is QPL'd, as
+    thanks of the Qt team. (Note: Ming-Che's code is QPL'd, as
     per an mail to qt-info@nokia.com.)
 
     However, since Big-5+ was never formally approved, and was never
@@ -185,7 +185,7 @@
 
     Most of the code here was written by Serika Kurusugawa,
     a.k.a. Junji Takagi, and is included in Qt with the author's
-    permission and the grateful thanks of the Trolltech team. Here is
+    permission and the grateful thanks of the Qt team. Here is
     the copyright statement for that code:
 
     \legalese
@@ -228,7 +228,7 @@
 
     It was largely written by Mizi Research Inc. Here is the
     copyright statement for the code as it was at the point of
-    contribution. Trolltech's subsequent modifications are covered by
+    contribution. The subsequent modifications are covered by
     the usual copyright for Qt.
 
     \legalese
@@ -395,7 +395,7 @@
 
     Most of the code here was written by Serika Kurusugawa,
     a.k.a. Junji Takagi, and is included in Qt with the author's
-    permission and the grateful thanks of the Trolltech team. Here is
+    permission and the grateful thanks of the Qt team. Here is
     the copyright statement for that code:
 
     \legalese
@@ -442,9 +442,9 @@
 
     Most of the code here was written by Serika Kurusugawa, a.k.a.
     Junji Takagi, and is included in Qt with the author's permission
-    and the grateful thanks of the Trolltech team. Here is the
+    and the grateful thanks of the Qt team. Here is the
     copyright statement for the code as it was at the point of
-    contribution. Trolltech's subsequent modifications are covered by
+    contribution. The subsequent modifications are covered by
     the usual copyright for Qt.
 
     \legalese
@@ -498,8 +498,8 @@
 
     Most of the code was written by Hans Petter Bieker and is
     included in Qt with the author's permission and the grateful
-    thanks of the Trolltech team. Here is the copyright statement for
-    the code as it was at the point of contribution. Trolltech's
+    thanks of the Qt team. Here is the copyright statement for
+    the code as it was at the point of contribution. The
     subsequent modifications are covered by the usual copyright for
     Qt:
 
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 83e6539..5165285 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -103,8 +103,8 @@
     \section1 Legal Notices
 
     Some source code in \QD is licensed under specific highly permissive
-    licenses from the original authors. Trolltech gratefully acknowledges
-    these contributions to \QD and all uses of \QD should also acknowledge
+    licenses from the original authors. We gratefully acknowledges
+    these contributions to \QD and all users of \QD should also acknowledge
     these contributions and quote the following license statements in an
     appendix to the documentation.
 
diff --git a/doc/src/emb-porting.qdoc b/doc/src/emb-porting.qdoc
index 4c746bf..1afd1be 100644
--- a/doc/src/emb-porting.qdoc
+++ b/doc/src/emb-porting.qdoc
@@ -49,7 +49,7 @@
     the standard C library and some POSIX functions, but only a Linux
     implementation is publically available. If you are looking for a
     non-Linux commercial implementation, it is worth contacting \l
-    {mailto:sales@trolltech.com}{sales@trolltech.com} to see if we can
+    {mailto:qt-info@nokia.com}{qt-info@nokia.com} to see if we can
     help.
 
     There are several issues to be aware of if you plan to do your own
diff --git a/doc/src/porting4-obsoletedmechanism.qdocinc b/doc/src/porting4-obsoletedmechanism.qdocinc
index 1594570..6bf0fbd 100644
--- a/doc/src/porting4-obsoletedmechanism.qdocinc
+++ b/doc/src/porting4-obsoletedmechanism.qdocinc
@@ -1,3 +1,3 @@
 If you use this mechanism in your application, please submit a
-report to the \l{Task Tracker} on the Trolltech
+report to the \l{Task Tracker} on the Qt
 website and we will try to find a satisfactory substitute.
diff --git a/doc/src/qmsdev.qdoc b/doc/src/qmsdev.qdoc
index b8d8f85..67de746 100644
--- a/doc/src/qmsdev.qdoc
+++ b/doc/src/qmsdev.qdoc
@@ -35,7 +35,7 @@
   \endlist
 
   Now the integration plugin should be installed. If this doesn't
-  work, then contact Trolltech technical support giving details of
+  work, then contact Qt technical support giving details of
   what went wrong.
   
   \section1 How to uninstall the Visual Studio Integration Plugin
diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index 566633f..08ca2f5 100644
--- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -246,16 +246,16 @@ QByteArray z = x.mid(5);        // z == "pineapples"
 
 
 //! [30]
-QByteArray x("TROlltECH");
+QByteArray x("Qt by NOKIA");
 QByteArray y = x.toLower();
-// y == "trolltech"
+// y == "qt by nokia"
 //! [30]
 
 
 //! [31]
-QByteArray x("TROlltECH");
+QByteArray x("Qt by NOKIA");
 QByteArray y = x.toUpper();
-// y == "TROLLTECH"
+// y == "QT BY NOKIA"
 //! [31]
 
 
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index 611daae..536473c 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -173,7 +173,7 @@ painter.drawPixmap(target, image, source);
 
 //! [17]
 QPainter painter(this);
-painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nTrolltech"));
+painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nNokia"));
 //! [17]
 
 
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
index c075462..521817e 100644
--- a/doc/src/snippets/qstring/main.cpp
+++ b/doc/src/snippets/qstring/main.cpp
@@ -801,8 +801,8 @@ void Widget::toLongLongFunction()
 void Widget::toLowerFunction()
 {
 //! [75]
-    QString str = "TROlltECH";
-    str = str.toLower();        // str == "trolltech"
+    QString str = "Qt by NOKIA";
+    str = str.toLower();        // str == "qt by nokia"
 //! [75]
 }
 
diff --git a/examples/opengl/hellogl/glwidget.cpp b/examples/opengl/hellogl/glwidget.cpp
index 5722f9a..877e1ca 100644
--- a/examples/opengl/hellogl/glwidget.cpp
+++ b/examples/opengl/hellogl/glwidget.cpp
@@ -55,8 +55,8 @@ GLWidget::GLWidget(QWidget *parent)
     yRot = 0;
     zRot = 0;
 
-    trolltechGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
-    trolltechPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
+    qtGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
+    qtPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
 }
 //! [0]
 
@@ -118,7 +118,7 @@ void GLWidget::setZRotation(int angle)
 //! [6]
 void GLWidget::initializeGL()
 {
-    qglClearColor(trolltechPurple.dark());
+    qglClearColor(qtPurple.dark());
     object = makeObject();
     glShadeModel(GL_FLAT);
     glEnable(GL_DEPTH_TEST);
@@ -234,7 +234,7 @@ GLuint GLWidget::makeObject()
 void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
                     GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
 {
-    qglColor(trolltechGreen);
+    qglColor(qtGreen);
 
     glVertex3d(x1, y1, -0.05);
     glVertex3d(x2, y2, -0.05);
@@ -249,7 +249,7 @@ void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
 
 void GLWidget::extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    qglColor(trolltechGreen.dark(250 + int(100 * x1)));
+    qglColor(qtGreen.dark(250 + int(100 * x1)));
 
     glVertex3d(x1, y1, +0.05);
     glVertex3d(x2, y2, +0.05);
diff --git a/examples/opengl/hellogl/glwidget.h b/examples/opengl/hellogl/glwidget.h
index be3fb35..1474965 100644
--- a/examples/opengl/hellogl/glwidget.h
+++ b/examples/opengl/hellogl/glwidget.h
@@ -91,8 +91,8 @@ private:
     int yRot;
     int zRot;
     QPoint lastPos;
-    QColor trolltechGreen;
-    QColor trolltechPurple;
+    QColor qtGreen;
+    QColor qtPurple;
 };
 //! [3]
 
diff --git a/examples/opengl/overpainting/glwidget.cpp b/examples/opengl/overpainting/glwidget.cpp
index 3e4b17f..a6e6195 100644
--- a/examples/opengl/overpainting/glwidget.cpp
+++ b/examples/opengl/overpainting/glwidget.cpp
@@ -64,8 +64,8 @@ GLWidget::GLWidget(QWidget *parent)
     yRot = 0;
     zRot = 0;
 
-    trolltechGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
-    trolltechPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
+    qtGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
+    qtPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
 
     animationTimer.setSingleShot(false);
     connect(&animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
@@ -142,7 +142,7 @@ void GLWidget::paintEvent(QPaintEvent *event)
 //! [4]
 
 //! [6]
-    qglClearColor(trolltechPurple.dark());
+    qglClearColor(qtPurple.dark());
     glShadeModel(GL_SMOOTH);
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
@@ -210,9 +210,9 @@ GLuint GLWidget::makeObject()
     glEnable(GL_NORMALIZE);
     glBegin(GL_QUADS);
 
-    static GLfloat logoDiffuseColor[4] = {trolltechGreen.red()/255.0,
-                                          trolltechGreen.green()/255.0,
-                                          trolltechGreen.blue()/255.0, 1.0};
+    static GLfloat logoDiffuseColor[4] = {qtGreen.red()/255.0,
+                                          qtGreen.green()/255.0,
+                                          qtGreen.blue()/255.0, 1.0};
     glMaterialfv(GL_FRONT, GL_DIFFUSE, logoDiffuseColor);
 
     GLdouble x1 = +0.06;
@@ -281,7 +281,7 @@ void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
 
 void GLWidget::extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    qglColor(trolltechGreen.dark(250 + int(100 * x1)));
+    qglColor(qtGreen.dark(250 + int(100 * x1)));
 
     glNormal3d((x1 + x2)/2.0, (y1 + y2)/2.0, 0.0);
     glVertex3d(x1, y1, +0.05);
diff --git a/examples/opengl/overpainting/glwidget.h b/examples/opengl/overpainting/glwidget.h
index df40808..13814a6 100644
--- a/examples/opengl/overpainting/glwidget.h
+++ b/examples/opengl/overpainting/glwidget.h
@@ -103,8 +103,8 @@ private:
     int yRot;
     int zRot;
     QPoint lastPos;
-    QColor trolltechGreen;
-    QColor trolltechPurple;
+    QColor qtGreen;
+    QColor qtPurple;
 //! [4]
     QList<Bubble*> bubbles;
     QTimer animationTimer;
diff --git a/examples/opengl/samplebuffers/glwidget.cpp b/examples/opengl/samplebuffers/glwidget.cpp
index 7b45856..9a41f51 100644
--- a/examples/opengl/samplebuffers/glwidget.cpp
+++ b/examples/opengl/samplebuffers/glwidget.cpp
@@ -106,7 +106,7 @@ void GLWidget::timerEvent(QTimerEvent *)
 
 void GLWidget::makeObject()
 {
-    QColor trolltechGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
+    QColor qtGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
     const double Pi = 3.14159265358979323846;
     const int NumSectors = 15;
     GLdouble x1 = +0.06;
@@ -134,13 +134,13 @@ void GLWidget::makeObject()
             GLdouble x8 = 0.30 * sin(angle2);
             GLdouble y8 = 0.30 * cos(angle2);
 
-            qglColor(trolltechGreen);
+            qglColor(qtGreen);
             quad(GL_QUADS, x5, y5, x6, y6, x7, y7, x8, y8);
             qglColor(Qt::black);
             quad(GL_LINE_LOOP, x5, y5, x6, y6, x7, y7, x8, y8);
         }
 
-        qglColor(trolltechGreen);
+        qglColor(qtGreen);
         quad(GL_QUADS, x1, y1, x2, y2, y2, x2, y1, x1);
         quad(GL_QUADS, x3, y3, x4, y4, y4, x4, y3, x3);
 
diff --git a/examples/tools/customcompleter/resources/wordlist.txt b/examples/tools/customcompleter/resources/wordlist.txt
index a5de826..f8b581a 100644
--- a/examples/tools/customcompleter/resources/wordlist.txt
+++ b/examples/tools/customcompleter/resources/wordlist.txt
@@ -1337,7 +1337,6 @@ transparency
 transparent
 travel
 traveled
-Trolltech
 true
 try
 turn
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index dafdb67..ea75cbc 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
     <folder folded="no">
         <title>Qt Resources</title>
         <folder folded="yes">
-            <title>Trolltech Partners</title>
+            <title>Qt Partners</title>
             <bookmark href="http://partners.trolltech.com/partners/training.html">
                 <title>Training Partners</title>
             </bookmark>
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index dafdb67..ea75cbc 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
     <folder folded="no">
         <title>Qt Resources</title>
         <folder folded="yes">
-            <title>Trolltech Partners</title>
+            <title>Qt Partners</title>
             <bookmark href="http://partners.trolltech.com/partners/training.html">
                 <title>Training Partners</title>
             </bookmark>
diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel
index dafdb67..ea75cbc 100644
--- a/examples/xml/streambookmarks/jennifer.xbel
+++ b/examples/xml/streambookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
     <folder folded="no">
         <title>Qt Resources</title>
         <folder folded="yes">
-            <title>Trolltech Partners</title>
+            <title>Qt Partners</title>
             <bookmark href="http://partners.trolltech.com/partners/training.html">
                 <title>Training Partners</title>
             </bookmark>
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
index 3828a2e..49add32 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
+++ b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
@@ -58,7 +58,7 @@ class PropertyToAtomicValue;
  * represents a property of the QObject. That is, if the QXmlNodeModelIndex is
  * an attribute.
  *
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
  */
 class QObjectXmlModel : public QSimpleXmlNodeModel
 {
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp
index f9acdcf..99023cf 100644
--- a/src/corelib/codecs/qtsciicodec.cpp
+++ b/src/corelib/codecs/qtsciicodec.cpp
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Hans Petter Bieker,
 // and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
 
 #include "qtsciicodec_p.h"
 #include "qlist.h"
diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index 4e8611b..adb0383 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Hans Petter Bieker,
 // and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
 
 /*
  * Copyright (C) 2000 Hans Petter Bieker. All rights reserved.
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index bcc7063..bb81fd3 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1250,7 +1250,7 @@ class QDataStream;
 
 /*
    No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols
-   for Trolltech's internal unit tests. If you want slower loading times and more
+   for Qt's internal unit tests. If you want slower loading times and more
    symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
 */
 #if defined(QT_BUILD_INTERNAL) && defined(Q_OS_WIN) && defined(QT_MAKEDLL)
diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/gui/itemviews/qdatawidgetmapper.cpp
index 8b5ba3b..4a8db9e 100644
--- a/src/gui/itemviews/qdatawidgetmapper.cpp
+++ b/src/gui/itemviews/qdatawidgetmapper.cpp
@@ -278,11 +278,11 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed()
     Let us assume that we have an item model named \c{model} with the following contents:
 
     \table
-    \row \o 1 \o Nokia Corporation and/or its subsidiary(-ies)    \o Oslo
-    \row \o 2 \o Trolltech Pty   \o Brisbane
-    \row \o 3 \o Trolltech Inc   \o Palo Alto
-    \row \o 4 \o Trolltech China \o Beijing
-    \row \o 5 \o Trolltech GmbH  \o Berlin
+    \row \o 1 \o Qt Norway       \o Oslo
+    \row \o 2 \o Qt Australia    \o Brisbane
+    \row \o 3 \o Qt USA          \o Palo Alto
+    \row \o 4 \o Qt China        \o Beijing
+    \row \o 5 \o Qt Germany      \o Berlin
     \endtable
 
     The following code will map the columns of the model to widgets called \c mySpinBox,
@@ -780,11 +780,11 @@ void QDataWidgetMapper::clearMapping()
     Use Qt::Horizontal for tabular data that looks like this:
 
     \table
-    \row \o 1 \o Nokia Corporation and/or its subsidiary(-ies)     \o Oslo
-    \row \o 2 \o Trolltech Pty   \o Brisbane
-    \row \o 3 \o Trolltech Inc   \o Silicon Valley
-    \row \o 4 \o Trolltech China \o Beijing
-    \row \o 5 \o Trolltech GmbH  \o Berlin
+    \row \o 1 \o Qt Norway       \o Oslo
+    \row \o 2 \o Qt Australia    \o Brisbane
+    \row \o 3 \o Qt USA          \o Silicon Valley
+    \row \o 4 \o Qt China        \o Beijing
+    \row \o 5 \o Qt Germany      \o Berlin
     \endtable
 
     If the orientation is set to Qt::Vertical, a widget is mapped to
@@ -796,7 +796,7 @@ void QDataWidgetMapper::clearMapping()
 
     \table
     \row \o 1 \o 2 \o 3 \o 4 \o 5
-    \row \o Nokia Corporation and/or its subsidiary(-ies) \o Trolltech Pty \o Trolltech Inc \o Trolltech China \o Trolltech GmbH
+    \row \o Qt Norway \o Qt Australia \o Qt USA \o Qt China \o Qt Germany
     \row \o Oslo \o Brisbane \o Silicon Valley \o Beijing \i Berlin
     \endtable
 
diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp
index 10c4e48..c3e2cfd 100644
--- a/src/gui/kernel/qmotifdnd_x11.cpp
+++ b/src/gui/kernel/qmotifdnd_x11.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /* The following copyright notice pertains to the code as contributed
-to Trolltech, not to Trolltech's modifications. It is replicated
+to Nokia, not to Nokia's modifications. It is replicated
 in doc/dnd.doc, where the documentation system can see it. */
 
 /* Copyright 1996 Daniel Dardailler.
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index 1b1046a..4f17dc8 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -1340,7 +1340,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
     Some commands, e.g. list(), emit additional signals to report
     their results.
 
-    Example: If you want to download the INSTALL file from Trolltech's
+    Example: If you want to download the INSTALL file from the Qt
     FTP server, you would write this:
 
     \snippet doc/src/snippets/code/src_network_access_qftp.cpp 1
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index c5223a7..45c454c 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -1447,8 +1447,7 @@ QString QHttpRequestHeader::toString() const
 
     To make an HTTP request you must set up suitable HTTP headers. The
     following example demonstrates, how to request the main HTML page
-    from the Trolltech home page (i.e., the URL
-    \c http://qt.nokia.com/index.html):
+    from the Qt home page (i.e., the URL \c http://qt.nokia.com/index.html):
 
     \snippet doc/src/snippets/code/src_network_access_qhttp.cpp 2
 
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 0736c66..a5ed0b5 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -41,7 +41,7 @@
 
 /****************************************************************************
 **
-** In addition, as a special exception, Trolltech gives permission to link
+** In addition, as a special exception, Nokia gives permission to link
 ** the code of its release of Qt with the OpenSSL project's "OpenSSL" library
 ** (or modified versions of the "OpenSSL" library that use the same license
 ** as the original version), and distribute the linked executables.
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index b2f059b..52e3e95 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -41,7 +41,7 @@
 
 /****************************************************************************
 **
-** In addition, as a special exception, Trolltech gives permission to link
+** In addition, as a special exception, Nokia gives permission to link
 ** the code of its release of Qt with the OpenSSL project's "OpenSSL" library
 ** (or modified versions of the "OpenSSL" library that use the same license
 ** as the original version), and distribute the linked executables.
diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
index d7aaf7f..19b259c 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.cpp
+++ b/src/plugins/codecs/jp/qeucjpcodec.cpp
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*! \class QEucJpCodec
     \reentrant
diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h
index 11a7066..393d7f1 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.h
+++ b/src/plugins/codecs/jp/qeucjpcodec.h
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*
  * Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp
index a495dae..3e4d5a0 100644
--- a/src/plugins/codecs/jp/qjiscodec.cpp
+++ b/src/plugins/codecs/jp/qjiscodec.cpp
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa,
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*! \class QJisCodec
     \reentrant
diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h
index 4d58647..9b95d58 100644
--- a/src/plugins/codecs/jp/qjiscodec.h
+++ b/src/plugins/codecs/jp/qjiscodec.h
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*
  * Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h
index eaa6a04..eaa76e8 100644
--- a/src/plugins/codecs/jp/qjpunicode.h
+++ b/src/plugins/codecs/jp/qjpunicode.h
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*
  * Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
index dafb4b3..d818ba7 100644
--- a/src/plugins/codecs/jp/qsjiscodec.cpp
+++ b/src/plugins/codecs/jp/qsjiscodec.cpp
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*! \class QSjisCodec
     \reentrant
diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h
index 7c1fddf..5719b93 100644
--- a/src/plugins/codecs/jp/qsjiscodec.h
+++ b/src/plugins/codecs/jp/qsjiscodec.h
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
 
 /*
  * Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp
index 959e4fa..8277995 100644
--- a/src/plugins/codecs/kr/qeuckrcodec.cpp
+++ b/src/plugins/codecs/kr/qeuckrcodec.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-// Most of the cp949 code was originally written by Joon-Kyu Park, and is included 
-// in Qt with the author's permission and the grateful thanks of the Trolltech team.
+// Most of the cp949 code was originally written by Joon-Kyu Park, and is included
+// in Qt with the author's permission and the grateful thanks of the Qt team.
 
 /*! \class QEucKrCodec
     \reentrant
diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h
index 9f0a9cc..d65b445 100644
--- a/src/plugins/codecs/tw/qbig5codec.h
+++ b/src/plugins/codecs/tw/qbig5codec.h
@@ -41,7 +41,7 @@
 
 // Most of the code here was originally written by Ming-Che Chuang and
 // is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
 
 #ifndef QBIG5CODEC_H
 #define QBIG5CODEC_H
diff --git a/tools/qvfb/qtopiakeysym.h b/tools/qvfb/qtopiakeysym.h
index 56bb8cc..277ad0a 100644
--- a/tools/qvfb/qtopiakeysym.h
+++ b/tools/qvfb/qtopiakeysym.h
@@ -1,8 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Phone Edition of the Qt Toolkit.
+** This file is part of the tools of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/qvfb/qvfbx11view.cpp b/tools/qvfb/qvfbx11view.cpp
index 292a946..a15a9ff 100644
--- a/tools/qvfb/qvfbx11view.cpp
+++ b/tools/qvfb/qvfbx11view.cpp
@@ -1,8 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Phone Edition of the Qt Toolkit.
+** This file is part of the tools of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/qvfb/qvfbx11view.h b/tools/qvfb/qvfbx11view.h
index 0186368..772c529 100644
--- a/tools/qvfb/qvfbx11view.h
+++ b/tools/qvfb/qvfbx11view.h
@@ -1,8 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Phone Edition of the Qt Toolkit.
+** This file is part of the tools of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/qvfb/x11keyfaker.cpp b/tools/qvfb/x11keyfaker.cpp
index 8c262d2..23ef9dc 100644
--- a/tools/qvfb/x11keyfaker.cpp
+++ b/tools/qvfb/x11keyfaker.cpp
@@ -1,8 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Phone Edition of the Qt Toolkit.
+** This file is part of the tools of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/qvfb/x11keyfaker.h b/tools/qvfb/x11keyfaker.h
index e8256eb..d159382 100644
--- a/tools/qvfb/x11keyfaker.h
+++ b/tools/qvfb/x11keyfaker.h
@@ -1,8 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Phone Edition of the Qt Toolkit.
+** This file is part of the tools of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp
index 8b79576..aaf3605 100644
--- a/tools/xmlpatterns/main.cpp
+++ b/tools/xmlpatterns/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Patternist project on Trolltech Labs.
+** This file is part of the Patternist project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -192,7 +192,7 @@ protected:
 
 #ifdef Q_OS_WIN
             /* If we don't open stdout in "binary" mode on Windows, it will translate
-             * 0xA into 0xD 0xA. See Trolltech task 173619, for an example. */
+             * 0xA into 0xD 0xA. */
             _setmode(_fileno(stdout), _O_BINARY);
             m_stdout = QT_WA_INLINE(_wfdopen(_fileno(stdout), L"wb"),_fdopen(_fileno(stdout), "wb"));
             out->open(m_stdout, QIODevice::WriteOnly);
diff --git a/tools/xmlpatterns/main.h b/tools/xmlpatterns/main.h
index 058c80e..54e0e91 100644
--- a/tools/xmlpatterns/main.h
+++ b/tools/xmlpatterns/main.h
@@ -1,9 +1,11 @@
 /****************************************************************************
- * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- * **
- * ** This file is part of the Patternist project on Trolltech Labs.  * **
- * ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the Patternist project on Qt Labs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -34,11 +36,12 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- * **
- * ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * **
- * ****************************************************************************/
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
 
 //
 //  W A R N I N G
diff --git a/tools/xmlpatterns/qcoloringmessagehandler_p.h b/tools/xmlpatterns/qcoloringmessagehandler_p.h
index 6606590..a846b96 100644
--- a/tools/xmlpatterns/qcoloringmessagehandler_p.h
+++ b/tools/xmlpatterns/qcoloringmessagehandler_p.h
@@ -1,9 +1,11 @@
 /****************************************************************************
- * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- * **
- * ** This file is part of the Patternist project on Trolltech Labs.  * **
- * ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the Patternist project on Qt Labs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -34,11 +36,12 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- * **
- * ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * **
- * ****************************************************************************/
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
 
 //
 //  W A R N I N G
diff --git a/tools/xmlpatterns/qcoloroutput.cpp b/tools/xmlpatterns/qcoloroutput.cpp
index 04ec78b..f779b06 100644
--- a/tools/xmlpatterns/qcoloroutput.cpp
+++ b/tools/xmlpatterns/qcoloroutput.cpp
@@ -1,10 +1,11 @@
 /****************************************************************************
- * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- * **
- * ** This file is part of the Patternist project on Trolltech Labs.
- * **
- * ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the Patternist project on Qt Labs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -35,11 +36,11 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- * **
- * ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * **
- * ****************************************************************************/
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
 
 #include <QFile>
 #include <QHash>
diff --git a/tools/xmlpatterns/qcoloroutput_p.h b/tools/xmlpatterns/qcoloroutput_p.h
index fecb517..3e9d54d 100644
--- a/tools/xmlpatterns/qcoloroutput_p.h
+++ b/tools/xmlpatterns/qcoloroutput_p.h
@@ -1,9 +1,11 @@
 /****************************************************************************
- * ** * ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- * **
- * ** This file is part of the Patternist project on Trolltech Labs.  * **
- * ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the Patternist project on Qt Labs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -34,11 +36,12 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- * **
- * ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * **
- * ****************************************************************************/
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
 
 //
 //  W A R N I N G
diff --git a/util/lexgen/README b/util/lexgen/README
index b8e9277..9feb18d 100644
--- a/util/lexgen/README
+++ b/util/lexgen/README
@@ -13,4 +13,4 @@ Use at your own risk ;-)
 
 
 --
-Simon Hausmann <simon@trolltech.com>
+Simon Hausmann <simon.hausmann@nokia.com>
diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp
index 261a8dd..efa4fea 100644
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h
index 39d4945..2ca914c 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index d6041e1..6bb0e4c 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index e519abc..ce81a73 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp
index c5b7f58..5f847a9 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/util/qlalr/dotgraph.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h
index cf52191..ea4c542 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp
index e91eb24..26f8378 100644
--- a/util/qlalr/grammar.cpp
+++ b/util/qlalr/grammar.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h
index 2876e9a..e1d8eff 100644
--- a/util/qlalr/grammar_p.h
+++ b/util/qlalr/grammar_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp
index 489fc68..797750c 100644
--- a/util/qlalr/lalr.cpp
+++ b/util/qlalr/lalr.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g
index f7f5bba..c98c2af 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -3,7 +3,7 @@
 -- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 -- Contact: Nokia Corporation (qt-info@nokia.com)
 --
--- This file is part of the QLALR project on Trolltech Labs.
+-- This file is part of the QLALR project on Qt Labs.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
 -- No Commercial Usage
@@ -83,7 +83,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -197,7 +197,7 @@ protected:
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h
index a4955e9..75cdbe0 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp
index e78aeb3..d3a9c7f 100644
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp
index f6a4058..bb78d2d 100644
--- a/util/qlalr/parsetable.cpp
+++ b/util/qlalr/parsetable.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h
index b144ff9..8aebdaf 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp
index 386dc31..de0475f 100644
--- a/util/qlalr/recognizer.cpp
+++ b/util/qlalr/recognizer.cpp
@@ -1,10 +1,9 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h
index 9ac8ee0..94f7035 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
-- 
cgit v0.12