summaryrefslogtreecommitdiffstats
path: root/examples/hapticsquare/main.cpp
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-09-20 14:41:21 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-24 10:55:03 +0200
commitf1172bda9ab83aa9402acf1a6976319a0ffcc29e (patch)
tree298fe6b2b9d33788cda1ee6e9e7e1a154a6315e5 /examples/hapticsquare/main.cpp
parentdcddd149fad60c4c557d9d8dc22f31c4a2cef2e7 (diff)
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I9c4a751fa94b68cee30105a7f7eeaf7fd7e1abf4 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'examples/hapticsquare/main.cpp')
-rw-r--r--examples/hapticsquare/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/hapticsquare/main.cpp b/examples/hapticsquare/main.cpp
index 19315ce..b0eb7a8 100644
--- a/examples/hapticsquare/main.cpp
+++ b/examples/hapticsquare/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 examples of the Qt Mobility Components.
**
@@ -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