diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:41:58 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:42:39 (GMT) |
| commit | 484a6043ef84df3d0d01a19247ea2c89eb8b309f (patch) | |
| tree | 43cbe0e0da00eff1f82a8ac5a641453cb730ce40 /src/script/bridge/qscriptobject_p.h | |
| parent | 67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6 (diff) | |
| parent | a61adccf96a8ceefbf1150966adda3f6d226ec6d (diff) | |
| download | Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.zip Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.gz Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2
Diffstat (limited to 'src/script/bridge/qscriptobject_p.h')
| -rw-r--r-- | src/script/bridge/qscriptobject_p.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/script/bridge/qscriptobject_p.h b/src/script/bridge/qscriptobject_p.h index 0992eec..a4faa06 100644 --- a/src/script/bridge/qscriptobject_p.h +++ b/src/script/bridge/qscriptobject_p.h @@ -6,35 +6,17 @@ ** ** This file is part of the QtScript 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. -** +** $QT_BEGIN_LICENSE:LGPL-ONLY$ ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser +** 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 -** 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. -** -** -** -** -** -** -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |