summaryrefslogtreecommitdiffstats
path: root/src/feedback/qfeedbackeffect_p.h
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 /src/feedback/qfeedbackeffect_p.h
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 'src/feedback/qfeedbackeffect_p.h')
-rw-r--r--src/feedback/qfeedbackeffect_p.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/feedback/qfeedbackeffect_p.h b/src/feedback/qfeedbackeffect_p.h
index 32c7619..7458212 100644
--- a/src/feedback/qfeedbackeffect_p.h
+++ b/src/feedback/qfeedbackeffect_p.h
@@ -1,38 +1,38 @@
/****************************************************************************
**
-** 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 QtFeedback module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$