Nokia to Digia changes in documentation

19 files changed, 47 insertions, 47 deletions

diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc
index 47456bdb5a..6bacfc46da 100644
--- a/doc/src/development/developing-with-qt.qdoc
+++ b/doc/src/development/developing-with-qt.qdoc
@@ -106,7 +106,7 @@
         \o  Documents related to Qt for Embedded Platforms.
         \o  A description of issues with Qt that are specific to Mac OS X.
         \o  An explanation of Qt's native features on Mac OS X.
-        \o  The platforms supported by Nokia for Qt.
+        \o  The platforms supported by Digia for Qt.
         \o  Describes the use and license of the qtmain helper library.
         \o  Collections of notes about Qt implementations on different window systems.
     \endlist
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 5a393f295d..04f0ce4b73 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -36,7 +36,7 @@
 
     \keyword qtestlib
 
-    The QTestLib framework, provided by Nokia, is a tool for unit
+    The QTestLib framework, provided by Digia, is a tool for unit
     testing Qt based applications and libraries. QTestLib provides
     all the functionality commonly found in unit testing frameworks as
     well as extensions for testing graphical user interfaces.
@@ -87,7 +87,7 @@
 
     \note For higher-level GUI and application testing needs, please
     see the \l{Partner Directory} for Qt testing products provided by
-    Nokia partners.
+    Digia partners.
 
 
     \section1 QTestLib API
diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc
index 69192c91e5..87e15d9936 100644
--- a/doc/src/examples/drilldown.qdoc
+++ b/doc/src/examples/drilldown.qdoc
@@ -37,7 +37,7 @@
     \image drilldown-example.png Screenshot of the Drill Down Example
 
     When running the example application, a user can retrieve
-    information about each of Nokia's Qt offices by clicking the
+    information about each of Digia's Qt offices by clicking the
     corresponding image. The application pops up an information window
     displaying the data, and allows the users to alter the location
     description as well as the image. The main view will be updated
@@ -280,7 +280,7 @@
     \snippet examples/sql/drilldown/view.h 1
 
     The QGraphicsView class is part of the \l {Graphics View
-    Framework} which we will use to display the images of Nokia's
+    Framework} which we will use to display the images of Digia's
     Qt offices. To be able to respond to user interaction;
     i.e., showing the
     appropriate information window whenever the user clicks one of the
diff --git a/doc/src/examples/svggenerator.qdoc b/doc/src/examples/svggenerator.qdoc
index 63f4646e94..b2fefba8c6 100644
--- a/doc/src/examples/svggenerator.qdoc
+++ b/doc/src/examples/svggenerator.qdoc
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Digia Plc (http://www.qt-project.org/legal)
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
diff --git a/doc/src/legal/gpl.qdoc b/doc/src/legal/gpl.qdoc
index 19747e3f1f..60cf444952 100644
--- a/doc/src/legal/gpl.qdoc
+++ b/doc/src/legal/gpl.qdoc
@@ -59,7 +59,7 @@ Reference: \l{GNU Lesser General Public License, version 2.1}
 
 \snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1
 
-\section1 Nokia Qt LGPL Exception version 1.0
+\section1 Digia Qt LGPL Exception version 1.0
 
 As a special exception to the GNU Lesser General Public License version 2.1,
 the object code form of a "work that uses the Library" may incorporate material
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 810b877dcf..c101617f08 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -49,11 +49,11 @@
     \l{GNU Lesser General Public License (LGPL)} or the
     \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
     specific licenses from the original authors. Some pieces of code were developed
-    by Nokia and others originated from third parties.
+    by Digia and others originated from third parties.
     This page lists the licenses used, names the authors, and links
     to the places where it is used.
 
-    Nokia gratefully acknowledges these and other contributions
+    Digia gratefully acknowledges these and other contributions
     to Qt. We recommend that programs that use Qt also acknowledge
     these contributions, and quote these license statements in an
     appendix to the documentation.
diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc
index 7df3fed65f..378e8f1d9e 100644
--- a/doc/src/legal/opensourceedition.qdoc
+++ b/doc/src/legal/opensourceedition.qdoc
@@ -40,7 +40,7 @@
     money. The Free Software Foundation, the creator of the GNU GPL, speaks
     of free in this context as in "free speech", not as in "no cost".
 
-    Nokia supports the free software concept by providing the Qt Open Source
+    Digia supports the free software concept by providing the Qt Open Source
     Edition, which is licensed under the \l{GNU General Public License (GPL)}
     (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
     You can use this edition of Qt to create and distribute software with licenses
@@ -75,5 +75,5 @@
     the sales department at http://qt.nokia.com/contact.
 
     If you are in doubt what edition of Qt is right for your project,
-    please contact \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}.
+    please contact \l{mailto:http://www.qt-project.org/legal}{http://www.qt-project.org/legal}.
 */
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 74b2e8c6bc..613705a4c0 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -31,9 +31,9 @@
 
     \title Trademarks
     \ingroup licensing
-    \brief Information about trademarks owned by Nokia and other organisations.
+    \brief Information about trademarks owned by Digia and other organisations.
 
-    Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
+    Digia, the Digia logo, Qt, and the Qt logo are trademarks of Digia
     Corporation and/or its subsidiaries in Finland and other countries.
 
     \list
@@ -57,6 +57,6 @@
     \o All other company, product, or service names may be trademarks or
        service marks of others and are the property of their respective owners.
        The use of the word partner does not imply a partnership relationship
-       between Nokia and any other company.
+       between Digia and any other company.
     \endlist
 */
diff --git a/doc/src/mainpage.qdoc b/doc/src/mainpage.qdoc
index f4c751526b..87c78cb1c6 100644
--- a/doc/src/mainpage.qdoc
+++ b/doc/src/mainpage.qdoc
@@ -62,7 +62,7 @@ to application testing and deployment.
 
 \keyword qt-platform-support
 \section2 Qt Platform Support
-Alternatively, Qt may be installed on its own without the Nokia Qt SDK.
+Alternatively, Qt may be installed on its own without the Digia Qt SDK.
 
 Information regarding Qt Support on Different Platforms:
 \list
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 40bb805dd8..fa4b072505 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -766,7 +766,7 @@
     Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br
     All rights reserved.
 
-    Contact:  Nokia Corporation (qt-info@nokia.com)\br
+    Contact:  Digia Corporation (http://www.qt-project.org/legal)\br
 
     You may use this file under the terms of the BSD license as follows:\br
 
@@ -778,7 +778,7 @@
     * Redistributions in binary form must reproduce the above copyright notice, this
     list of conditions and the following disclaimer in the documentation and/or other
     materials provided with the distribution.\br
-    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the names of
+    * Neither the name of Digia Plc nor the names of
     its contributors may be used to endorse or promote products derived from this
     software without specific prior written permission.
 
@@ -815,7 +815,7 @@
     Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br
     All rights reserved.
 
-    Contact:  Nokia Corporation (qt-info@nokia.com)\br
+    Contact:  Digia Plc (http://www.qt-project.org/legal)\br
 
     You may use this file under the terms of the BSD license as follows:\br
 
@@ -827,7 +827,7 @@
     * Redistributions in binary form must reproduce the above copyright notice, this
     list of conditions and the following disclaimer in the documentation and/or other
     materials provided with the distribution.\br
-    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the names of
+    * Neither the name of Digia Plc nor the names of
     its contributors may be used to endorse or promote products derived from this
     software without specific prior written permission.
 
@@ -907,7 +907,7 @@
     Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br
     All rights reserved.
 
-    Contact:  Nokia Corporation (qt-info@nokia.com)
+    Contact:  Digia Plc (http://www.qt-project.org/legal)
 
     You may use this file under the terms of the BSD license as follows:
 
@@ -919,7 +919,7 @@
     * Redistributions in binary form must reproduce the above copyright notice, this
     list of conditions and the following disclaimer in the documentation and/or other
     materials provided with the distribution.\br
-    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the names of
+    * Neither the name of Digia Plc nor the names of
     its contributors may be used to endorse or promote products derived from this
     software without specific prior written permission.
 
@@ -958,7 +958,7 @@
       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.\br
-      * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+      * Neither the name of Digia Plc nor
         the names of its contributors may be used to endorse or promote
         products derived from this software without specific prior written
         permission.
diff --git a/doc/src/platforms/emb-fonts.qdoc b/doc/src/platforms/emb-fonts.qdoc
index c3413927ed..205573619f 100644
--- a/doc/src/platforms/emb-fonts.qdoc
+++ b/doc/src/platforms/emb-fonts.qdoc
@@ -49,7 +49,7 @@
 
     Support for other font formats can be added. To make a suggestion,
     please create a task in our bug tracker at \l
-    {http://bugreports.qt.nokia.com}{http://bugreports.qt.nokia.com}.
+    {http://bugreports.qt-project.org/}{http://bugreports.qt-project.org/}.
 
     \tableofcontents
 
@@ -118,7 +118,7 @@
     The Qt Prerendered Font (QPF2) is an architecture-independent,
     light-weight and non-scalable font format specific to \l{Qt for Embedded Linux}.
 
-    Nokia provides the cross-platform \l makeqpf tool, included in the
+    Digia provides the cross-platform \l makeqpf tool, included in the
     \c tools directory of both \l {Qt} and \l{Qt for Embedded Linux}, which allows
     generation of QPF2 files from system fonts.
 
@@ -130,7 +130,7 @@
     \target QPF
     \section1 Legacy Qt Prerendered Font (QPF)
 
-    Nokia provides support for the legacy QPF format for compatibility
+    Digia provides support for the legacy QPF format for compatibility
     reasons. QPF is based on the internal font engine data structure of Qt/Embedded
     versions 2 and 3.
 
diff --git a/doc/src/platforms/emb-porting.qdoc b/doc/src/platforms/emb-porting.qdoc
index dfc4c0064a..f2561482d8 100644
--- a/doc/src/platforms/emb-porting.qdoc
+++ b/doc/src/platforms/emb-porting.qdoc
@@ -36,7 +36,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:qt-info@nokia.com}{qt-info@nokia.com} to see if we can
+    {mailto:http://www.qt-project.org/legal}{http://www.qt-project.org/legal} 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/platforms/qtmac-as-native.qdoc b/doc/src/platforms/qtmac-as-native.qdoc
index e821b6e231..d4224afefa 100644
--- a/doc/src/platforms/qtmac-as-native.qdoc
+++ b/doc/src/platforms/qtmac-as-native.qdoc
@@ -141,6 +141,6 @@
 
     Qt does not entirely interact with the development environment (for
     example plugins to set a file to "mocable" from within the Xcode
-    user interface). Nokia is actively working on improving Qt's
+    user interface). Digia is actively working on improving Qt's
     interoperability with various IDEs.
 */
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index faadafc51a..2479c19d28 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -94,7 +94,7 @@
 
     \section2 Cross-Platform Development using Qt Creator
 
-    \l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+    \l{http://doc.qt.Digia.com/qtcreator-snapshot/index.html}{Qt Creator} is
     a complete Cross-platform IDE included in the Qt SDK. The IDE allows
     programmers to create, build, debug and run Qt applications accross all
     supported platforms.
@@ -156,13 +156,13 @@
         \o \l{Qt Assistant Manual}{Qt Assistant} is a customizable HTML help
         file reader providing the complete Qt documentation offline.
         \o Integration with
-        \l{http://doc.qt.nokia.com/qt-eclipse-1.6/index.html}{Eclipse}
+        \l{http://doc.qt.Digia.com/qt-eclipse-1.6/index.html}{Eclipse}
         and KDevelop IDEs are also available.
     \endlist
 
     \section2 Cross-Platform Development using Qt Creator
 
-    \l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+    \l{http://doc.qt.Digia.com/qtcreator-snapshot/index.html}{Qt Creator} is
     a complete Cross-platform IDE included in the Qt SDK. The IDE allows
     programmers to create, build, debug and run Qt applications accross all
     supported platforms.
@@ -247,7 +247,7 @@
 
     \section2 Cross-Platform Development using Qt Creator
 
-    \l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+    \l{http://doc.qt.Digia.com/qtcreator-snapshot/index.html}{Qt Creator} is
     a complete Cross-platform IDE included in the Qt SDK. The IDE allows
     programmers to create, build, debug and run Qt applications accross all
     supported platforms.
@@ -503,7 +503,7 @@
 
     \section2 Cross-Platform Development using Qt Creator
 
-    \l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+    \l{http://doc.qt.Digia.com/qtcreator-snapshot/index.html}{Qt Creator} is
     a complete Cross-platform IDE included in the Qt SDK. The IDE allows
     programmers to create, build, debug and run Qt applications accross all
     supported platforms.
@@ -590,7 +590,7 @@
 
     \section2 Cross-Platform Development using Qt Creator
 
-    \l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+    \l{http://doc.qt.Digia.com/qtcreator-snapshot/index.html}{Qt Creator} is
     a complete Cross-platform IDE included in the Qt SDK. The IDE allows
     programmers to create, build, debug and run Qt applications accross all
     supported platforms.
@@ -670,7 +670,7 @@
 
     \section2 Cross-Platform Development using Qt Creator
 
-    \l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+    \l{http://doc.qt.Digia.com/qtcreator-snapshot/index.html}{Qt Creator} is
     a complete Cross-platform IDE included in the Qt SDK. The IDE allows
     programmers to create, build, debug and run Qt applications accross all
     supported platforms.
@@ -682,7 +682,7 @@
 /*!
     \page supported-platforms.html
     \title Supported Platforms
-    \brief The platforms supported by Nokia for Qt.
+    \brief The platforms supported by Digia for Qt.
     \ingroup platform-specific
     \group platform-details
 
@@ -724,7 +724,7 @@
     Qt is supported on a variety of 32-bit and 64-bit platforms, and can
     usually be built on each platform with GCC, a vendor-supplied compiler, or
     a third party compiler. Although Qt may be built on a range of platform-compiler
-    combinations, only a subset of these are actively supported by Nokia.
+    combinations, only a subset of these are actively supported by Digia.
 
     \tableofcontents
 
@@ -810,9 +810,9 @@
 
     \note The PPC architecture on Mac has been downgraded from tier 1 to tier 2 for 4.7.
 
-    \section1 Tier 3 Platforms (Not Supported by Nokia)
+    \section1 Tier 3 Platforms (Not Supported by Digia)
 
-    All platforms not specifically listed above are not supported by Nokia. Nokia does
+    All platforms not specifically listed above are not supported by Digia. Digia does
     not run its unit test suite or perform any other internal tests on platforms not
     listed above.
 
@@ -823,13 +823,13 @@
 
     Qt users should note, however, that there may be various open source
     projects, community users and/or Qt partners who are able to provide assistance with
-    platforms not supported by Nokia.
+    platforms not supported by Digia.
 
     \section1 General Legal Disclaimer
 
     Please note that Qt is offered on an "as is" basis without warranty
     of any kind and that our products are not error or bug free. To the maximum extent
-    permitted by applicable law, Nokia on behalf of itself and its suppliers, disclaims all
+    permitted by applicable law, Digia on behalf of itself and its suppliers, disclaims all
     warranties and conditions, either express or implied, including, but not limited to,
     implied warranties of merchantability, fitness for a particular purpose, title and
     non-infringement with regard to the Licensed Software.
diff --git a/doc/src/porting/qt3to4.qdoc b/doc/src/porting/qt3to4.qdoc
index 0711fbb2cb..c2dbd51f5c 100644
--- a/doc/src/porting/qt3to4.qdoc
+++ b/doc/src/porting/qt3to4.qdoc
@@ -131,7 +131,7 @@
     \section1 Legal Notices
 
     Some source code in \c qt3to4 is licensed under specific highly
-    permissive licenses from the original authors. Nokia gratefully
+    permissive licenses from the original authors. Digia gratefully
     acknowledges these contributions to \c qt3to4 and all uses of
     \c qt3to4 should also acknowledge these contributions and quote the
     following license statements in an appendix to the documentation.
diff --git a/doc/src/snippets/code/src_corelib_tools_qregexp.cpp b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
index 3d8ccd8c67..63fd547d2a 100644
--- a/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
@@ -129,7 +129,7 @@ while (pos >= 0) {
 
 
 //! [10]
-str = "Nokia Corporation\tqt.nokia.com\tNorway";
+str = "Digia Corporation\tqt.nokia.com\tNorway";
 QString company, web, country;
 rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$");
 if (rx.indexIn(str) != -1) {
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index ae068d60b9..f8a17d0a12 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -214,7 +214,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 by\nDigia"));
 //! [17]
 
 
diff --git a/doc/src/snippets/declarative/imports/merged-named-imports.qml b/doc/src/snippets/declarative/imports/merged-named-imports.qml
index 1a1a1c3780..85aa181df0 100644
--- a/doc/src/snippets/declarative/imports/merged-named-imports.qml
+++ b/doc/src/snippets/declarative/imports/merged-named-imports.qml
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 //! [imports]
-import QtQuick 1.0 as Nokia
-import Ovi 1.0 as Nokia
+import QtQuick 1.0 as Digia
+import Ovi 1.0 as Digia
 //! [imports]
 
 Item {
diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/doc/src/snippets/declarative/text/onLinkActivated.qml
index 89b8f3257e..83d858067a 100644
--- a/doc/src/snippets/declarative/text/onLinkActivated.qml
+++ b/doc/src/snippets/declarative/text/onLinkActivated.qml
@@ -46,7 +46,7 @@ Rectangle {
 //![0]
     Text {
             textFormat: Text.RichText
-            text: "The main website is at <a href=\"http://qt.nokia.com\">Nokia Qt DF</a>."
+            text: "The main website is at <a href=\"http://qt.digia.com\">Digia Qt DF</a>."
             onLinkActivated: console.log(link + " link activated")
     }
 //![0]