diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 10:46:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 10:46:26 +0200 |
| commit | be3916b7e4e8007394cbed40484ef6b696e90f2b (patch) | |
| tree | a66dc85f3900e08a040f0d80eb0e56f43a163efc /util/scripts/make_qfeatures_dot_h | |
| parent | ed24cd82444faeeda0a171a9082808ebb667e092 (diff) | |
| parent | 389c4fdebe681eb3af5a2431c390323f52a03c17 (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
Diffstat (limited to 'util/scripts/make_qfeatures_dot_h')
| -rwxr-xr-x | util/scripts/make_qfeatures_dot_h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h index 056c11368d..27f43e9bda 100755 --- a/util/scripts/make_qfeatures_dot_h +++ b/util/scripts/make_qfeatures_dot_h @@ -2,9 +2,9 @@ # # Usage: make_qfeatures_dot_h # -# Generates core/base/qfeatures.h from core/base/qfeatures.txt. +# Generates src/corelib/global/qfeatures.h from src/corelib/global/qfeatures.txt. # -# The tools/qfeatures.txt file can contain redundancies, and this program +# The qfeatures.txt file can contain redundancies, and this program # will show them. # @@ -86,11 +86,11 @@ print OUT '/**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Qt Software Information (qt-info\@nokia.com) ** ** This file is part of the QtCore module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** \$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 @@ -119,8 +119,8 @@ print OUT ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ +** contact the sales department at qt-sales\@nokia.com. +** \$QT_END_LICENSE\$ ** ****************************************************************************/ |