diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-21 09:13:03 +0300 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-28 13:57:03 +0200 |
commit | 1bd82349f0b8eef67e04f9592ae2bae954683968 (patch) | |
tree | cbcbf40ddd16734fac806752fdd4642655bd1542 /src/quicktestlib/testlib/qplaintestlogger_p.h | |
parent | 770354700d35a713fe5c35dc4e96ab5675443a20 (diff) |
Fixed licenses
Updated licenses using replace-licenses.zsh from mkdist repo.
Possible copyright and contact changes will come later.
Change-Id: Ib9f0616600aa0a3461a1aa08b9da8545a85259e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'src/quicktestlib/testlib/qplaintestlogger_p.h')
-rw-r--r-- | src/quicktestlib/testlib/qplaintestlogger_p.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/quicktestlib/testlib/qplaintestlogger_p.h b/src/quicktestlib/testlib/qplaintestlogger_p.h index 7462e5c..72497e7 100644 --- a/src/quicktestlib/testlib/qplaintestlogger_p.h +++ b/src/quicktestlib/testlib/qplaintestlogger_p.h @@ -7,11 +7,13 @@ ** This file is part of the QtTest 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$ |