diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-21 10:31:17 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-21 22:25:29 +0100 |
commit | 8f4053db305d2a9c7ca4161037219955e2e6c9ab (patch) | |
tree | b74d91e8d7d7e2b4a35ac0d84102c10dcc9b4973 /doc | |
parent | fa71048534a414dc7fab2b101f74162392792000 (diff) |
Change copyright headers from Nokia to Digia
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/fixnavi.pl | 42 | ||||
-rw-r--r-- | doc/installerfw-getting-started.qdoc | 28 | ||||
-rw-r--r-- | doc/installerfw-overview.qdoc | 28 | ||||
-rw-r--r-- | doc/installerfw-reference.qdoc | 28 | ||||
-rw-r--r-- | doc/installerfw-using.qdoc | 28 | ||||
-rw-r--r-- | doc/installerfw.qdoc | 28 | ||||
-rw-r--r-- | doc/noninteractive.qdoc | 28 | ||||
-rw-r--r-- | doc/operations.qdoc | 28 | ||||
-rw-r--r-- | doc/scripting.qdoc | 28 | ||||
-rw-r--r-- | doc/tutorial.qdoc | 28 |
10 files changed, 194 insertions, 100 deletions
diff --git a/doc/fixnavi.pl b/doc/fixnavi.pl index 973578905..572d6186f 100644 --- a/doc/fixnavi.pl +++ b/doc/fixnavi.pl @@ -1,4 +1,44 @@ -#! /usr/bin/perl +#!/usr/bin/env perl +############################################################################# +## +## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/legal +## +## This file is part of the Qt Installer Framework. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. For licensing terms and +## conditions see http://qt.digia.com/licensing. For further information +## use the contact form at http://qt.digia.com/contact-us. +## +## 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, Digia gives you certain additional +## rights. These rights are described in the Digia 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. +## +## +## $QT_END_LICENSE$ +## +############################################################################# use warnings; use strict; diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 05b7901cc..ab2f6a4af 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/installerfw-overview.qdoc b/doc/installerfw-overview.qdoc index 5d92afb58..26bcab83d 100644 --- a/doc/installerfw-overview.qdoc +++ b/doc/installerfw-overview.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/installerfw-reference.qdoc b/doc/installerfw-reference.qdoc index d29dd2976..a562c562a 100644 --- a/doc/installerfw-reference.qdoc +++ b/doc/installerfw-reference.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc index 61d4ca94b..3e6ef0b10 100644 --- a/doc/installerfw-using.qdoc +++ b/doc/installerfw-using.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index aa4b3d940..1a5bf3ed1 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/noninteractive.qdoc b/doc/noninteractive.qdoc index 36612b2e2..27c802e78 100644 --- a/doc/noninteractive.qdoc +++ b/doc/noninteractive.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/operations.qdoc b/doc/operations.qdoc index a9ba63235..276b7515a 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/scripting.qdoc b/doc/scripting.qdoc index 8b8e52a39..70ecc8ed0 100644 --- a/doc/scripting.qdoc +++ b/doc/scripting.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc index 5a10a7d06..5fe77f414 100644 --- a/doc/tutorial.qdoc +++ b/doc/tutorial.qdoc @@ -1,21 +1,27 @@ /**************************************************************************** ** -** This file is part of Qt Installer Framework +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** This file is part of the Qt Installer Framework. ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Free Documentation License +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** +** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ |