From 61570cd378e1b5a257ad90efcdac4098cb85262c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 16 Nov 2012 21:49:48 +0100 Subject: Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: I8b2ed2e09e9beb46bdda354017c29f00be6ae76f Reviewed-by: Akseli Salovaara Reviewed-by: Lars Knoll --- src/corelib/arch/sparc/qatomic32.s | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'src/corelib/arch/sparc/qatomic32.s') diff --git a/src/corelib/arch/sparc/qatomic32.s b/src/corelib/arch/sparc/qatomic32.s index a242add4bc..0100086107 100644 --- a/src/corelib/arch/sparc/qatomic32.s +++ b/src/corelib/arch/sparc/qatomic32.s @@ -1,17 +1,19 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! -!! Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +!! Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). !! All rights reserved. -!! Contact: Nokia Corporation (qt-info@nokia.com) +!! Contact: http://www.qt-project.org/legal !! !! This file is part of the QtGui module of the Qt Toolkit. !! !! $QT_BEGIN_LICENSE:LGPL$ -!! No Commercial Usage -!! This file contains pre-release code and may not be distributed. -!! You may use this file in accordance with the terms and conditions -!! contained in the Technology Preview License Agreement accompanying -!! this package. +!! 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 !! Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,18 +23,17 @@ !! 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. !! -!! If you have questions regarding the use of this file, please contact -!! Nokia at qt-info@nokia.com. -!! -!! -!! -!! -!! -!! +!! 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. !! !! !! $QT_END_LICENSE$ -- cgit v1.2.3