diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 08:26:40 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 08:26:40 (GMT) |
| commit | 8a58bde27c9e23cd8a5688fdc50b6b74d25411a6 (patch) | |
| tree | 28102e03233c45524aa75cbdbcb9287d6b8bc1f4 /tests/auto/xmlpatternsxqts | |
| parent | 8529d7e3ace4994cd2caf563bb437f2c5c38bcee (diff) | |
| parent | 624ea78d71dca5112272597f9f1ee165c2275c5c (diff) | |
| download | Qt-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.zip Qt-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.tar.gz Qt-8a58bde27c9e23cd8a5688fdc50b6b74d25411a6.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
Diffstat (limited to 'tests/auto/xmlpatternsxqts')
| -rw-r--r-- | tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp index a8c1648..15b7e0b 100644 --- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp +++ b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp @@ -38,47 +38,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Patternist project on Qt Labs. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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. -** -** GNU Lesser General Public License Usage -** Alternatively, 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.0, 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 are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** $QT_END_LICENSE$ -** -*************************************************************************** - */ #include <QtTest/QtTest> |