diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-10 00:15:48 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-10 00:15:48 (GMT) |
| commit | 9e43002b7d7319c143c97b707e095fef434d0af2 (patch) | |
| tree | a9601fb969dfef5a05c8ce70e85030ae1e3cacbb /src/gui/embedded/qwsdisplay_qws.h | |
| parent | c5be02430eda5a555114ef332a389b7621904b17 (diff) | |
| parent | 9fe43c999d3d9b21836345522bb67bab38e661af (diff) | |
| download | Qt-9e43002b7d7319c143c97b707e095fef434d0af2.zip Qt-9e43002b7d7319c143c97b707e095fef434d0af2.tar.gz Qt-9e43002b7d7319c143c97b707e095fef434d0af2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/embedded/qwsdisplay_qws.h')
| -rw-r--r-- | src/gui/embedded/qwsdisplay_qws.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/embedded/qwsdisplay_qws.h b/src/gui/embedded/qwsdisplay_qws.h index d6dd943..7738267 100644 --- a/src/gui/embedded/qwsdisplay_qws.h +++ b/src/gui/embedded/qwsdisplay_qws.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. |