summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch/sparc/qatomic64.s
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-01-15 09:08:27 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-01-15 12:25:24 +0000
commit1a88b2f768e86474f8fc6facf60cd0dd46a555c8 (patch)
treebf381a9644c884ff7b3a041bae472645c110daaf /src/corelib/arch/sparc/qatomic64.s
parent71404b0be1468fbf53d2ffb11f9f513371f9b1c5 (diff)
Updated license headers
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I046ec3e47b1876cd7b4b0353a576b352e3a946d9 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/corelib/arch/sparc/qatomic64.s')
-rw-r--r--src/corelib/arch/sparc/qatomic64.s34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/corelib/arch/sparc/qatomic64.s b/src/corelib/arch/sparc/qatomic64.s
index 440167b7db..ae5c57a173 100644
--- a/src/corelib/arch/sparc/qatomic64.s
+++ b/src/corelib/arch/sparc/qatomic64.s
@@ -1,31 +1,37 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!
-!! Copyright (C) 2015 The Qt Company Ltd.
-!! Contact: http://www.qt.io/licensing/
+!! Copyright (C) 2016 The Qt Company Ltd.
+!! Contact: https://www.qt.io/licensing/
!!
!! This file is part of the QtGui module of the Qt Toolkit.
!!
-!! $QT_BEGIN_LICENSE:LGPL21$
+!! $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 The Qt Company. For licensing terms
-!! and conditions see http://www.qt.io/terms-conditions. For further
-!! information use the contact form at http://www.qt.io/contact-us.
+!! and conditions see https://www.qt.io/terms-conditions. For further
+!! information use the contact form at https://www.qt.io/contact-us.
!!
!! GNU Lesser General Public License Usage
!! Alternatively, this file may be used under the terms of the GNU Lesser
-!! General Public License version 2.1 or version 3 as published by the Free
-!! Software Foundation and appearing in the file LICENSE.LGPLv21 and
-!! LICENSE.LGPLv3 included in the packaging of this file. Please review the
-!! following information to ensure the GNU Lesser General Public License
-!! requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-!! http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+!! General Public License version 3 as published by the Free Software
+!! Foundation and appearing in the file LICENSE.LGPL3 included in the
+!! packaging of this file. Please review the following information to
+!! ensure the GNU Lesser General Public License version 3 requirements
+!! will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
!!
-!! As a special exception, The Qt Company gives you certain additional
-!! rights. These rights are described in The Qt Company 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 2.0 or (at your option) the GNU General
+!! Public license version 3 or any later version approved by the KDE Free
+!! Qt Foundation. The licenses are as published by the Free Software
+!! Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+!! included in the packaging of this file. Please review the following
+!! information to ensure the GNU General Public License requirements will
+!! be met: https://www.gnu.org/licenses/gpl-2.0.html and
+!! https://www.gnu.org/licenses/gpl-3.0.html.
!!
!! $QT_END_LICENSE$
!!