diff options
Diffstat (limited to 'doc/src/legal/licenses.qdoc')
-rw-r--r-- | doc/src/legal/licenses.qdoc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 97623d2fad..ecbb154974 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -1,17 +1,18 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** ** $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. +** 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 @@ -21,18 +22,17 @@ ** 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 +** 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. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** +** 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$ @@ -309,7 +309,7 @@ Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)\br Copyright (C) 2009 Jian Li <jianli@chromium.org>\br Copyright (C) 2007 Staikos Computing Services Inc.\br - Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)\br + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)\br Copyright (C) 2008 Nuanti Ltd.\br Copyright (C) 2007 David Smith (catfish.man@gmail.com)\br Copyright (C) 2008 Tony Chang <idealisms@gmail.com>\br @@ -512,7 +512,7 @@ Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)\br Copyright (c) 2009 The Android Open Source Project\br Copyright (C) 2008 Dirk Schulze <krit@webkit.org>\br - Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)\br + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)\br Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>\br Copyright (C) 2009 280 North Inc. All Rights Reserved.\br Copyright (C) 2009 Joseph Pecoraro\br |