diff options
| author | ck <qt-info@nokia.com> | 2010-04-27 07:14:54 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2010-04-27 07:14:54 (GMT) |
| commit | 12c3858494167b701208a9f56faf79ec2a0f61cd (patch) | |
| tree | e7ddcafb89445fa6cdce176d3ce40a223e5f20f4 /tools/assistant | |
| parent | 4c577d37d7caaa831e62c5651513656975af3134 (diff) | |
| download | Qt-12c3858494167b701208a9f56faf79ec2a0f61cd.zip Qt-12c3858494167b701208a9f56faf79ec2a0f61cd.tar.gz Qt-12c3858494167b701208a9f56faf79ec2a0f61cd.tar.bz2 | |
Assistant: Fix license headers.
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/tools/assistant/openpageswidget.cpp | 40 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/openpageswidget.h | 40 |
2 files changed, 52 insertions, 28 deletions
diff --git a/tools/assistant/tools/assistant/openpageswidget.cpp b/tools/assistant/tools/assistant/openpageswidget.cpp index bbc86c3..96af7b5 100644 --- a/tools/assistant/tools/assistant/openpageswidget.cpp +++ b/tools/assistant/tools/assistant/openpageswidget.cpp @@ -1,20 +1,19 @@ -/**************************************************************************
-**
-** This file is part of the Assistant module of the Qt toolkit.
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+/****************************************************************************
**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** Commercial Usage
+** This file is part of the Assistant module of the Qt Toolkit.
**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** $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 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
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
@@ -22,10 +21,23 @@ ** 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.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
+** 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.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
**
-**************************************************************************/
+****************************************************************************/
#include "openpageswidget.h"
diff --git a/tools/assistant/tools/assistant/openpageswidget.h b/tools/assistant/tools/assistant/openpageswidget.h index 5b35321..511735e 100644 --- a/tools/assistant/tools/assistant/openpageswidget.h +++ b/tools/assistant/tools/assistant/openpageswidget.h @@ -1,20 +1,19 @@ -/**************************************************************************
-**
-** This file is part of the Assistant module of the Qt toolkit.
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+/****************************************************************************
**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** Commercial Usage
+** This file is part of the Assistant module of the Qt Toolkit.
**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** $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 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
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
@@ -22,10 +21,23 @@ ** 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.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
+** 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.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
**
-**************************************************************************/
+****************************************************************************/
#ifndef OPENPAGESWIDGET_H
#define OPENPAGESWIDGET_H
|