summaryrefslogtreecommitdiffstats
path: root/src/s60main
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-09-25 09:31:19 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-29 05:57:45 (GMT)
commit619136931e2c985377348d196d488e429a4858d6 (patch)
tree627b1197a7888451c26df27dcd3b0d1e34c127ce /src/s60main
parent14dabf0f354b4f3817393d9b9e52473f88b896da (diff)
downloadQt-619136931e2c985377348d196d488e429a4858d6.zip
Qt-619136931e2c985377348d196d488e429a4858d6.tar.gz
Qt-619136931e2c985377348d196d488e429a4858d6.tar.bz2
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'src/s60main')
-rw-r--r--src/s60main/qts60main.cpp12
-rw-r--r--src/s60main/qts60main_mcrt0.cpp14
2 files changed, 13 insertions, 13 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index b38a6c2..fece779 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.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 Symbian application wrapper 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
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index af062e2..3951a24 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.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 Symbian application wrapper 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
@@ -40,7 +40,7 @@
// MCRT0.CPP
//
-// Portions copyright (c) 2005-2006 Nokia Corporation. All rights reserved.
+// Portions copyright (c) 2012 Digia Plc.
// Copyright (c) Symbian Software Ltd 1997-2004. All rights reserved.
//