diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 10:18:15 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 10:18:15 (GMT) |
| commit | 5d3a2b852aaaa66f120ab4d8618900dfa603e359 (patch) | |
| tree | 79e86f692bb3b56eb02dd5797ab20b1e5c34470c /src/gui/painting/qcups_p.h | |
| parent | c9e10372b59584c99f225bdf5453f0f03b9d5f59 (diff) | |
| parent | ae88ef4063548816efd4371920deeb4d87ea98f4 (diff) | |
| download | Qt-5d3a2b852aaaa66f120ab4d8618900dfa603e359.zip Qt-5d3a2b852aaaa66f120ab4d8618900dfa603e359.tar.gz Qt-5d3a2b852aaaa66f120ab4d8618900dfa603e359.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/painting/qcups_p.h')
| -rw-r--r-- | src/gui/painting/qcups_p.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/painting/qcups_p.h b/src/gui/painting/qcups_p.h index 8abc466..5f7b522 100644 --- a/src/gui/painting/qcups_p.h +++ b/src/gui/painting/qcups_p.h @@ -9,8 +9,8 @@ ** 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 @@ -21,20 +21,20 @@ ** 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$ ** ****************************************************************************/ |