summaryrefslogtreecommitdiff
path: root/doc/src/snippets/qt-namespace
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-09-20 14:03:59 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-23 10:07:20 +0200
commitd65ddf9d9122c4b6e49549355b6c58a7c10b637b (patch)
tree89b32a6e792cc77c13f745fccd6191ee376c0a11 /doc/src/snippets/qt-namespace
parentff305e0a51e73b3431e778572162c3f8af4f8ec2 (diff)
downloadqtdoc-d65ddf9d9122c4b6e49549355b6c58a7c10b637b.tar.gz
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I887dbadf259a84981160c00476a93fe581b4baa2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'doc/src/snippets/qt-namespace')
-rw-r--r--doc/src/snippets/qt-namespace/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/snippets/qt-namespace/main.cpp b/doc/src/snippets/qt-namespace/main.cpp
index 8c37fc7a..6c1656f3 100644
--- a/doc/src/snippets/qt-namespace/main.cpp
+++ b/doc/src/snippets/qt-namespace/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -17,10 +17,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT