diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-05-17 00:14:05 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-05-17 00:14:05 (GMT) |
| commit | 22aaef6c81897f96e9954b5aaae1816d143b456f (patch) | |
| tree | ce72f8eab81a63a70f6d14d97c6edab4185e1759 /tests/auto/moc/win-newlines.h | |
| parent | 8befc4982a32752e48c82cacbed045e7336a3569 (diff) | |
| download | Qt-22aaef6c81897f96e9954b5aaae1816d143b456f.zip Qt-22aaef6c81897f96e9954b5aaae1816d143b456f.tar.gz Qt-22aaef6c81897f96e9954b5aaae1816d143b456f.tar.bz2 | |
Updating file with CRLF line endings for the updated header
This file requires CRLF line terminators to pass the tst_moc test
after a license update.
Diffstat (limited to 'tests/auto/moc/win-newlines.h')
| -rw-r--r-- | tests/auto/moc/win-newlines.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/tests/auto/moc/win-newlines.h b/tests/auto/moc/win-newlines.h index b7576a7..568cd30 100644 --- a/tests/auto/moc/win-newlines.h +++ b/tests/auto/moc/win-newlines.h @@ -6,35 +6,35 @@ **
** This file is part of the test suite of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to 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. -** -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** +** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to 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.
+**
+** 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
|