diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-03 12:19:05 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-03 12:19:05 (GMT) |
| commit | 6147b21f92b9101f69ed2d916ed005aeb378bdc1 (patch) | |
| tree | e684f880a7af0267bb756b7d5a2b7eed66eebfb9 /util/scripts/make_qfeatures_dot_h | |
| parent | 77bc072f5b93e43f38eeb31d966fa76a3f6bd61c (diff) | |
| parent | 5699577461e75093222d6bcd7ce22b0c24a74095 (diff) | |
| download | Qt-6147b21f92b9101f69ed2d916ed005aeb378bdc1.zip Qt-6147b21f92b9101f69ed2d916ed005aeb378bdc1.tar.gz Qt-6147b21f92b9101f69ed2d916ed005aeb378bdc1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'util/scripts/make_qfeatures_dot_h')
| -rwxr-xr-x | util/scripts/make_qfeatures_dot_h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h index 9e5ddf1..7894510 100755 --- a/util/scripts/make_qfeatures_dot_h +++ b/util/scripts/make_qfeatures_dot_h @@ -94,8 +94,8 @@ print OUT ** 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. +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -106,20 +106,20 @@ print OUT ** 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.0, included in the file LGPL_EXCEPTION.txt in this +** 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. ** -** 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. +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info\@nokia.com. +** +** +** +** +** +** +** ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. ** \$QT_END_LICENSE\$ ** ****************************************************************************/ |