diff options
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 64 |
1 files changed, 53 insertions, 11 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 5e759db65c..298e0beffe 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 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) ** @@ -622,7 +622,7 @@ 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) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). \BR + Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). \BR Contact: Nokia Corporation (qt-info@nokia.com) This library is free software; you can redistribute it and/or @@ -794,7 +794,7 @@ \legalese Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team \BR - Changes are Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + Changes are Copyright (C) 2010 Nokia Corporation 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 @@ -863,7 +863,7 @@ the following license. \legalese - Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br All rights reserved. Contact: Nokia Corporation (qt-info@nokia.com)\br @@ -913,7 +913,7 @@ the following license. \legalese - Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br All rights reserved. Contact: Nokia Corporation (qt-info@nokia.com)\br @@ -996,9 +996,9 @@ \brief Describes the use and license of the qtmain helper library. qtmain is a helper library that enables the developer to write a - cross-platform main() function on Windows. If you do not use \l qmake - or other build tools such as CMake, then you need to link against - the \c qtmain library. + cross-platform main() function on Windows and on the Symbian platform. + If you do not use \l qmake or other build tools such as CMake, then you + need to link against the \c qtmain library. \section1 License Information @@ -1008,12 +1008,12 @@ the following license. \legalese - Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\br + Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br All rights reserved. - Contact: Nokia Corporation (qt-info@nokia.com)\br + Contact: Nokia Corporation (qt-info@nokia.com) - You may use this file under the terms of the BSD license as follows:\br + You may use this file under the terms of the BSD license as follows: "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1037,6 +1037,48 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." \endlegalese + + The contents of the \c{qts60main.cpp} and \c{qts60main_mcrt0.cpp} files, + located in the \c{src/s60main} directory are not covered by the + \l{GNU General Public License (GPL)}, the + \l{GNU Lesser General Public License (LGPL)}, or the + \l{Qt Commercial Editions}{Qt Commercial License}. Instead, they are + distributed under the following license. + + \legalese + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br + All rights reserved.\br + Contact: Nokia Corporation (qt-info@nokia.com) + + This file is part of the Symbian application wrapper of the Qt Toolkit. + + You may use this file under the terms of the BSD license as follows: + + "Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met:\br + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.\br + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.\br + * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + \endlegalese */ /*! |