From 959adf163bf94fe5b811046d8cdc2c1306c0a61d Mon Sep 17 00:00:00 2001 From: Teemu Kaukoranta Date: Mon, 17 Jun 2013 09:30:44 +0300 Subject: Updated licenses and contact details Replaced license in header with Digia's LGPL license. Updated contact details to qt-project.org/legal Change-Id: Ib3da82b4d33e68dbac42aa85452f341f1115a642 Reviewed-by: Sergio Ahumada --- gammaraysettings.h | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'gammaraysettings.h') diff --git a/gammaraysettings.h b/gammaraysettings.h index 9842964..a6e7679 100644 --- a/gammaraysettings.h +++ b/gammaraysettings.h @@ -7,27 +7,37 @@ ** ** Contact: Kläralvdalens Datakonsult AB (info@kdab.com) ** +** $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 +** 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. ** -** 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. ** -** Other Usage +** 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. ** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** $QT_END_LICENSE$ ** **************************************************************************/ -- cgit v1.2.3