diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-01 13:27:21 +1000 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-01 13:27:21 +1000 |
| commit | ec581ee164cbdab1a321d44f0795a79d62faf569 (patch) | |
| tree | eb761d18e630960505d64098a76e9454d5145a98 /tests/auto/qmargins | |
| parent | d80748df828b92f376ca779ab83776f3c9f53ce1 (diff) | |
Update license headers.
Reviewed-by: Trust Me
Diffstat (limited to 'tests/auto/qmargins')
| -rw-r--r-- | tests/auto/qmargins/tst_qmargins.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tests/auto/qmargins/tst_qmargins.cpp b/tests/auto/qmargins/tst_qmargins.cpp index 070aa19d58..6ee24953df 100644 --- a/tests/auto/qmargins/tst_qmargins.cpp +++ b/tests/auto/qmargins/tst_qmargins.cpp @@ -9,8 +9,8 @@ ** 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. +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,25 +21,24 @@ ** 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 +** 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. +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** ** -** 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> #include <qmargins.h> |