diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-10 08:39:39 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-10 08:39:39 (GMT) |
| commit | 0adc0bc91d0745177a30ce5899583f5e127d01b9 (patch) | |
| tree | 3633014fced73a982a169ff34f5a26ba8f5210fa /src/gui/image/qbitmap.h | |
| parent | 27d3905f3d08ef0498ceba1eeb367403cf9f2980 (diff) | |
| parent | 87fd237f2857e0d988a476731662a34c6bf045b3 (diff) | |
| download | Qt-0adc0bc91d0745177a30ce5899583f5e127d01b9.zip Qt-0adc0bc91d0745177a30ce5899583f5e127d01b9.tar.gz Qt-0adc0bc91d0745177a30ce5899583f5e127d01b9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/image/qbitmap.h')
| -rw-r--r-- | src/gui/image/qbitmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index c531061..0a3e622 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -20,10 +21,9 @@ ** 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. +** 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. |