Update information from Nokia to Digia and Qt Project

Task-number: QTBUG-28156
Change-Id: I2d813a0f4fa266af004714f04b16501f5751c881
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

diff --git a/src/assistant/clucene/qanalyzer.cpp b/src/assistant/clucene/qanalyzer.cpp
index dd9dd06..555f472 100644 (file)
--- a/src/assistant/clucene/qanalyzer.cpp
+++ b/src/assistant/clucene/qanalyzer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qanalyzer_p.h b/src/assistant/clucene/qanalyzer_p.h
index 307cfb1..a376ee1 100644 (file)
--- a/src/assistant/clucene/qanalyzer_p.h
+++ b/src/assistant/clucene/qanalyzer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h
index fa914c7..6bd2ce9 100644 (file)
--- a/src/assistant/clucene/qclucene-config_p.h
+++ b/src/assistant/clucene/qclucene-config_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h
index fb66e54..e84fa28 100644 (file)
--- a/src/assistant/clucene/qclucene_global_p.h
+++ b/src/assistant/clucene/qclucene_global_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qdocument.cpp b/src/assistant/clucene/qdocument.cpp
index 90e9678..e9b6c79 100644 (file)
--- a/src/assistant/clucene/qdocument.cpp
+++ b/src/assistant/clucene/qdocument.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qdocument_p.h b/src/assistant/clucene/qdocument_p.h
index 06a9d5a..2969450 100644 (file)
--- a/src/assistant/clucene/qdocument_p.h
+++ b/src/assistant/clucene/qdocument_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qfield.cpp b/src/assistant/clucene/qfield.cpp
index 695c920..91617fc 100644 (file)
--- a/src/assistant/clucene/qfield.cpp
+++ b/src/assistant/clucene/qfield.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qfield_p.h b/src/assistant/clucene/qfield_p.h
index 555d9d8..e37d2e7 100644 (file)
--- a/src/assistant/clucene/qfield_p.h
+++ b/src/assistant/clucene/qfield_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qfilter.cpp b/src/assistant/clucene/qfilter.cpp
index 89402f9..8c7f917 100644 (file)
--- a/src/assistant/clucene/qfilter.cpp
+++ b/src/assistant/clucene/qfilter.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qfilter_p.h b/src/assistant/clucene/qfilter_p.h
index a45b988..5f55c23 100644 (file)
--- a/src/assistant/clucene/qfilter_p.h
+++ b/src/assistant/clucene/qfilter_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qhits.cpp b/src/assistant/clucene/qhits.cpp
index a6d4905..38b5f5a 100644 (file)
--- a/src/assistant/clucene/qhits.cpp
+++ b/src/assistant/clucene/qhits.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qhits_p.h b/src/assistant/clucene/qhits_p.h
index 69912a9..444e65e 100644 (file)
--- a/src/assistant/clucene/qhits_p.h
+++ b/src/assistant/clucene/qhits_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qindexreader.cpp b/src/assistant/clucene/qindexreader.cpp
index 3b19a98..b27d35e 100644 (file)
--- a/src/assistant/clucene/qindexreader.cpp
+++ b/src/assistant/clucene/qindexreader.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qindexreader_p.h b/src/assistant/clucene/qindexreader_p.h
index 1c9ef5f..9787837 100644 (file)
--- a/src/assistant/clucene/qindexreader_p.h
+++ b/src/assistant/clucene/qindexreader_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qindexwriter.cpp b/src/assistant/clucene/qindexwriter.cpp
index 5795352..4b1557a 100644 (file)
--- a/src/assistant/clucene/qindexwriter.cpp
+++ b/src/assistant/clucene/qindexwriter.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qindexwriter_p.h b/src/assistant/clucene/qindexwriter_p.h
index 03be0d5..ff9f5f0 100644 (file)
--- a/src/assistant/clucene/qindexwriter_p.h
+++ b/src/assistant/clucene/qindexwriter_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qquery.cpp b/src/assistant/clucene/qquery.cpp
index bdbe99e..b8ea8f4 100644 (file)
--- a/src/assistant/clucene/qquery.cpp
+++ b/src/assistant/clucene/qquery.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qquery_p.h b/src/assistant/clucene/qquery_p.h
index 7ae4889..d1fb52a 100644 (file)
--- a/src/assistant/clucene/qquery_p.h
+++ b/src/assistant/clucene/qquery_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qqueryparser.cpp b/src/assistant/clucene/qqueryparser.cpp
index 8fa8784..3823970 100644 (file)
--- a/src/assistant/clucene/qqueryparser.cpp
+++ b/src/assistant/clucene/qqueryparser.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qqueryparser_p.h b/src/assistant/clucene/qqueryparser_p.h
index a88ab0e..2fff243 100644 (file)
--- a/src/assistant/clucene/qqueryparser_p.h
+++ b/src/assistant/clucene/qqueryparser_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qreader.cpp b/src/assistant/clucene/qreader.cpp
index 227ade0..4067a6e 100644 (file)
--- a/src/assistant/clucene/qreader.cpp
+++ b/src/assistant/clucene/qreader.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qreader_p.h b/src/assistant/clucene/qreader_p.h
index 3c7a8a6..87c5d2d 100644 (file)
--- a/src/assistant/clucene/qreader_p.h
+++ b/src/assistant/clucene/qreader_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qsearchable.cpp b/src/assistant/clucene/qsearchable.cpp
index f3e88a6..44c7f59 100644 (file)
--- a/src/assistant/clucene/qsearchable.cpp
+++ b/src/assistant/clucene/qsearchable.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qsearchable_p.h b/src/assistant/clucene/qsearchable_p.h
index 915436d..a051ce2 100644 (file)
--- a/src/assistant/clucene/qsearchable_p.h
+++ b/src/assistant/clucene/qsearchable_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qsort.cpp b/src/assistant/clucene/qsort.cpp
index b187aa4..3326f41 100644 (file)
--- a/src/assistant/clucene/qsort.cpp
+++ b/src/assistant/clucene/qsort.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qsort_p.h b/src/assistant/clucene/qsort_p.h
index 72c701c..e37772f 100644 (file)
--- a/src/assistant/clucene/qsort_p.h
+++ b/src/assistant/clucene/qsort_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qterm.cpp b/src/assistant/clucene/qterm.cpp
index 4578329..fe22e4c 100644 (file)
--- a/src/assistant/clucene/qterm.cpp
+++ b/src/assistant/clucene/qterm.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qterm_p.h b/src/assistant/clucene/qterm_p.h
index b977f93..e578989 100644 (file)
--- a/src/assistant/clucene/qterm_p.h
+++ b/src/assistant/clucene/qterm_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qtoken.cpp b/src/assistant/clucene/qtoken.cpp
index ee3793f..7e86208 100644 (file)
--- a/src/assistant/clucene/qtoken.cpp
+++ b/src/assistant/clucene/qtoken.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qtoken_p.h b/src/assistant/clucene/qtoken_p.h
index 52c086e..9619617 100644 (file)
--- a/src/assistant/clucene/qtoken_p.h
+++ b/src/assistant/clucene/qtoken_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qtokenizer.cpp b/src/assistant/clucene/qtokenizer.cpp
index b82841d..f0cb499 100644 (file)
--- a/src/assistant/clucene/qtokenizer.cpp
+++ b/src/assistant/clucene/qtokenizer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qtokenizer_p.h b/src/assistant/clucene/qtokenizer_p.h
index c6f60a1..aa88753 100644 (file)
--- a/src/assistant/clucene/qtokenizer_p.h
+++ b/src/assistant/clucene/qtokenizer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qtokenstream.cpp b/src/assistant/clucene/qtokenstream.cpp
index 96fcb64..b578fa8 100644 (file)
--- a/src/assistant/clucene/qtokenstream.cpp
+++ b/src/assistant/clucene/qtokenstream.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/clucene/qtokenstream_p.h b/src/assistant/clucene/qtokenstream_p.h
index ebaa241..dce5970 100644 (file)
--- a/src/assistant/clucene/qtokenstream_p.h
+++ b/src/assistant/clucene/qtokenstream_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
 ** All rights reserved.
 **
-** Portion Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
 **
 ** This file may be used under the terms of the GNU Lesser General Public

diff --git a/src/assistant/help/qhelpgenerator.cpp b/src/assistant/help/qhelpgenerator.cpp
index 4f55cdd..01394b1 100644 (file)
--- a/src/assistant/help/qhelpgenerator.cpp
+++ b/src/assistant/help/qhelpgenerator.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.

diff --git a/src/assistant/help/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h
index 720424d..698c4ae 100644 (file)
--- a/src/assistant/help/qhelpgenerator_p.h
+++ b/src/assistant/help/qhelpgenerator_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.

diff --git a/src/assistant/shared/helpgenerator.cpp b/src/assistant/shared/helpgenerator.cpp
index 317e1b2..426068c 100644 (file)
--- a/src/assistant/shared/helpgenerator.cpp
+++ b/src/assistant/shared/helpgenerator.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.

diff --git a/src/assistant/shared/helpgenerator.h b/src/assistant/shared/helpgenerator.h
index 0c10107..7c4b375 100644 (file)
--- a/src/assistant/shared/helpgenerator.h
+++ b/src/assistant/shared/helpgenerator.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.

diff --git a/src/designer/src/designer/Info_mac.plist b/src/designer/src/designer/Info_mac.plist
index f19176f..1100995 100644 (file)
--- a/src/designer/src/designer/Info_mac.plist
+++ b/src/designer/src/designer/Info_mac.plist
@@ -30,6 +30,6 @@
                 </dict>
         </array>
        <key>NOTE</key>
-       <string>Qt/Designer by Nokia Corporation and/or its subsidiary(-ies)</string>
+        <string>Qt/Designer by Digia Plc and/or its subsidiary(-ies)</string>
 </dict>
 </plist>

diff --git a/src/designer/src/lib/shared/textpropertyeditor.cpp b/src/designer/src/lib/shared/textpropertyeditor.cpp
index ca24e9b..dc29a9c 100644 (file)
--- a/src/designer/src/lib/shared/textpropertyeditor.cpp
+++ b/src/designer/src/lib/shared/textpropertyeditor.cpp
@@ -278,7 +278,7 @@ namespace qdesigner_internal {
                 urlCompletions.push_back(QStringLiteral("about:blank"));
                 urlCompletions.push_back(QStringLiteral("http://"));
                 urlCompletions.push_back(QStringLiteral("http://www."));
-                urlCompletions.push_back(QStringLiteral("http://qt.nokia.com/"));
+                urlCompletions.push_back(QStringLiteral("http://qt-project.org/"));
                 urlCompletions.push_back(QStringLiteral("file://"));
                 urlCompletions.push_back(QStringLiteral("ftp://"));
                 urlCompletions.push_back(QStringLiteral("data:"));

diff --git a/src/linguist/linguist/mainwindow.ui b/src/linguist/linguist/mainwindow.ui
index f55422d..db16055 100644 (file)
--- a/src/linguist/linguist/mainwindow.ui
+++ b/src/linguist/linguist/mainwindow.ui
@@ -679,7 +679,7 @@
     <string>About Qt</string>
    </property>
    <property name="whatsThis">
-    <string>Display information about the Qt toolkit by Nokia.</string>
+    <string>Display information about the Qt toolkit by Digia.</string>
    </property>
    <property name="menuRole">
     <enum>QAction::AboutQtRole</enum>

diff --git a/src/linguist/lrelease/lrelease.1 b/src/linguist/lrelease/lrelease.1
index f71c501..cccab63 100644 (file)
--- a/src/linguist/lrelease/lrelease.1
+++ b/src/linguist/lrelease/lrelease.1
@@ -1,4 +1,4 @@
-.TH lrelease 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.TH lrelease 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 .\" Contact: http://www.qt-project.org/legal
@@ -115,4 +115,4 @@ lrelease gnomovision_*.ts
 .SH "SEE ALSO"
 .BR lupdate (1)
 and
-.BR http://qt.nokia.com/doc/i18n.html
+.BR http://qt-project.org/doc/qt-4.8/tools-i18n.html

diff --git a/src/linguist/lupdate/lupdate.1 b/src/linguist/lupdate/lupdate.1
index cb35bd6..03fb94a 100644 (file)
--- a/src/linguist/lupdate/lupdate.1
+++ b/src/linguist/lupdate/lupdate.1
@@ -1,4 +1,4 @@
-.TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.TH lupdate 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 .\" Contact: http://www.qt-project.org/legal
@@ -150,4 +150,4 @@ lupdate *.cpp *.h *.ui -ts gnomovision_dk.ts
 .SH "SEE ALSO"
 .BR lrelease (1)
 and
-.BR http://qt.nokia.com/doc/i18n.html
+.BR http://qt-project.org/doc/qt-4.8/tools-i18n.html

diff --git a/src/linguist/phrasebooks/polish.qph b/src/linguist/phrasebooks/polish.qph
index 9cedaec..a43ca60 100644 (file)
--- a/src/linguist/phrasebooks/polish.qph
+++ b/src/linguist/phrasebooks/polish.qph
@@ -514,7 +514,7 @@
 </phrase>
 <phrase>
     <source>You need a commercial</source>
-    <target>Aby móc sprzedawać aplikację utworzone przy pomocy Qt potrzebujesz wersji komercyjnej. Proszę sprawdzić &lt;a href=&quot;http://qt.nokia.com/about&quot;&gt;qt.nokia.com/about&lt;/a&gt; dla poznania sposobu licencjonowania Qt.</target>
+    <target>Aby móc sprzedawać aplikację utworzone przy pomocy Qt potrzebujesz wersji komercyjnej. Proszę sprawdzić &lt;a href=&quot;http://qt-project.org/about&quot;&gt;qt-project.org/about&lt;/a&gt; dla poznania sposobu licencjonowania Qt.</target>
 </phrase>
 <phrase>
     <source>Zoom in</source>

diff --git a/src/linguist/qdoc.conf b/src/linguist/qdoc.conf
index 31d44d5..76ca7f2 100644 (file)
--- a/src/linguist/qdoc.conf
+++ b/src/linguist/qdoc.conf
@@ -3,7 +3,7 @@ DOCDIRS         = $QTDIR/tools/linguist/doc
 EXAMPLEDIRS     = $QTDIR/tools/linguist/tutorial
 OUTPUTDIR      = $QTDIR/tools/linguist/doc/html
 BASE           = file:$QTDIR/tools/linguist/doc/html/
-COMPANY                = Nokia Corporation and/or its subsidiary(-ies)
+COMPANY         = Digia Plc and/or its subsidiary(-ies)
 PRODUCT                = Qt Linguist
 VERSIONSYM     = QT_VERSION_STR
 DEFINE         = QT_QDOC QT_.*_SUPPORT _WS_.*_

diff --git a/src/qtconcurrent/codegenerator/src/codegenerator.cpp b/src/qtconcurrent/codegenerator/src/codegenerator.cpp
index 417ea5c..e4c4102 100644 (file)
--- a/src/qtconcurrent/codegenerator/src/codegenerator.cpp
+++ b/src/qtconcurrent/codegenerator/src/codegenerator.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the tools applications of the Qt Toolkit.

diff --git a/src/qtconcurrent/codegenerator/src/codegenerator.h b/src/qtconcurrent/codegenerator/src/codegenerator.h
index 2693c96..9ce1035 100644 (file)
--- a/src/qtconcurrent/codegenerator/src/codegenerator.h
+++ b/src/qtconcurrent/codegenerator/src/codegenerator.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the tools applications of the Qt Toolkit.

diff --git a/src/qtconfig/previewwidget.ui b/src/qtconfig/previewwidget.ui
index 6b225e2..94f1364 100644 (file)
--- a/src/qtconfig/previewwidget.ui
+++ b/src/qtconfig/previewwidget.ui
@@ -220,7 +220,7 @@
           <bool>true</bool>
          </property>
          <property name="html">
-          <string>&lt;p&gt;&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;&lt;/p&gt;
+          <string>&lt;p&gt;&lt;a href=&quot;http://qt-project.org&quot;&gt;http://qt-project.org&lt;/a&gt;&lt;/p&gt;
 &lt;p&gt;&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;&lt;/p&gt;</string>
          </property>
         </widget>