diff options
author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-04 07:36:29 (GMT) |
---|---|---|
committer | Morten Sorvig <msorvig@trolltech.com> | 2009-08-04 07:36:29 (GMT) |
commit | 5079cc13e0c8b644512eec4b770fe0763451e2a7 (patch) | |
tree | bbb08befb222773a672950163706faaa8e7de89c /src/gui/embedded/qkbdqnx_qws.cpp | |
parent | 895757ded9c9b0a07163e84b155ef4c8a623d1a0 (diff) | |
parent | d65f8930a29c1a5bf0639010734185f04e3a7656 (diff) | |
download | Qt-5079cc13e0c8b644512eec4b770fe0763451e2a7.zip Qt-5079cc13e0c8b644512eec4b770fe0763451e2a7.tar.gz Qt-5079cc13e0c8b644512eec4b770fe0763451e2a7.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/embedded/qkbdqnx_qws.cpp')
-rw-r--r-- | src/gui/embedded/qkbdqnx_qws.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/embedded/qkbdqnx_qws.cpp b/src/gui/embedded/qkbdqnx_qws.cpp index 06163c7..089b868 100644 --- a/src/gui/embedded/qkbdqnx_qws.cpp +++ b/src/gui/embedded/qkbdqnx_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtGui 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 |