diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-30 12:00:23 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-30 12:00:23 (GMT) |
| commit | 801a3780c9d029a288f60ddc4485ce34bd7fa94f (patch) | |
| tree | ff0728320e1938908912506ab776299af6d45543 /src/gui/painting/qdrawhelper_armv6_rvct.inc | |
| parent | 2ff6c9e8d89590c8180769bd54e545f40ca9a56f (diff) | |
| parent | 8d3d7d411491e50c1c6a62f473a1fa69a3ca2773 (diff) | |
| download | Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.zip Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.tar.gz Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.tar.bz2 | |
Merge branch '4.6' into lighthouse
Conflicts:
configure
src/gui/image/qpixmapdatafactory.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'src/gui/painting/qdrawhelper_armv6_rvct.inc')
| -rw-r--r-- | src/gui/painting/qdrawhelper_armv6_rvct.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.inc b/src/gui/painting/qdrawhelper_armv6_rvct.inc index 3318b4d..447cf27 100644 --- a/src/gui/painting/qdrawhelper_armv6_rvct.inc +++ b/src/gui/painting/qdrawhelper_armv6_rvct.inc @@ -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. @@ -37,7 +37,7 @@ ;** ;** $QT_END_LICENSE$ ;** -;****************************************************************************/ +;**************************************************************************** ; ; W A R N I N G |