diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-10 06:10:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-10 06:10:21 (GMT) |
| commit | 73fa8dd86f14ab161c84fa9224cd4335f352ba75 (patch) | |
| tree | 762caf155cf274b90cda6e576e6ee5247b6d24f9 | |
| parent | 5b24c5793607c809b1bac82c7cc3696001ee9217 (diff) | |
| download | Qt-73fa8dd86f14ab161c84fa9224cd4335f352ba75.zip Qt-73fa8dd86f14ab161c84fa9224cd4335f352ba75.tar.gz Qt-73fa8dd86f14ab161c84fa9224cd4335f352ba75.tar.bz2 | |
Fix license headers for QStringBuilder.
Only release branches are allowed to have the Commercial usage header.
All other branches must have the No Commercial Usage header.
Reviewed-by: Trust Me
| -rw-r--r-- | src/corelib/tools/qstringbuilder.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qstringbuilder.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp index 03d8160..740deb4 100644 --- a/src/corelib/tools/qstringbuilder.cpp +++ b/src/corelib/tools/qstringbuilder.cpp @@ -3,14 +3,14 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 2c31476..30a7c67 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -3,14 +3,14 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser |