diff options
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 2686162748..8eaa8dc1e1 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -1,17 +1,19 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the +** 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 Nokia. +** 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,8 +23,8 @@ ** 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. ** ** GNU General Public License Usage @@ -33,8 +35,7 @@ ** 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. +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -629,8 +630,8 @@ Copyright (C) 2004-2009 Matthias Kretz <kretz@kde.org> \BR Copyright (C) 2008 Ian Monroe <ian@monroe.nu> \BR Copyright (C) 2007-2008 Trolltech ASA \BR - Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). \BR - Contact: Nokia Corporation (qt-info@nokia.com) + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). \BR + Contact: http://www.qt-project.org/legal This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -801,7 +802,7 @@ \legalese Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team \BR - Changes are Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + Changes are Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -872,7 +873,7 @@ the following license. \legalese - Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved. Contact: Nokia Corporation (qt-info@nokia.com)\br @@ -924,7 +925,7 @@ the following license. \legalese - Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved. Contact: Nokia Corporation (qt-info@nokia.com)\br @@ -1019,7 +1020,7 @@ the following license. \legalese - Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved. Contact: Nokia Corporation (qt-info@nokia.com) @@ -1057,9 +1058,9 @@ distributed under the following license. \legalese - Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br All rights reserved.\br - Contact: Nokia Corporation (qt-info@nokia.com) + Contact: http://www.qt-project.org/legal This file is part of the Symbian application wrapper of the Qt Toolkit. |