diff options
| author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-06-17 09:30:44 +0300 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-19 15:15:35 +0200 |
| commit | 959adf163bf94fe5b811046d8cdc2c1306c0a61d (patch) | |
| tree | 9a07806a3cacfb01562ad45771be152256bd3730 /gammarayruncontrolfactory.h | |
| parent | cb270b805088140c169ff7c47ed67162be27fc49 (diff) | |
Replaced license in header with Digia's LGPL license.
Updated contact details to qt-project.org/legal
Change-Id: Ib3da82b4d33e68dbac42aa85452f341f1115a642
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'gammarayruncontrolfactory.h')
| -rw-r--r-- | gammarayruncontrolfactory.h | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/gammarayruncontrolfactory.h b/gammarayruncontrolfactory.h index d356620..1d8ab96 100644 --- a/gammarayruncontrolfactory.h +++ b/gammarayruncontrolfactory.h @@ -6,17 +6,18 @@ ** ** Author: Milian Wolff, KDAB (milian.wolff@kdab.com) ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/legal ** -** Commercial Usage -** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the +** $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 Nokia. +** 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 @@ -24,8 +25,20 @@ ** 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. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** 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. +** +** +** $QT_END_LICENSE$ ** **************************************************************************/ #ifndef GAMMARAYRUNCONTROLFACTORY_H |