summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-01-07 17:12:17 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-01-13 10:10:54 (GMT)
commit3064243f6e474f29f3dd64596c62d03d8a953c4f (patch)
tree0b66a8d8af0c475496cc5913f6176d0260d045d0
parent3a297b96bf69fbd238b9e8fb773036225513efc9 (diff)
downloadQt-3064243f6e474f29f3dd64596c62d03d8a953c4f.zip
Qt-3064243f6e474f29f3dd64596c62d03d8a953c4f.tar.gz
Qt-3064243f6e474f29f3dd64596c62d03d8a953c4f.tar.bz2
Doc: Added license information for the Symbian version of qtmain.
Reviewed-by: Trust Me Discussed-with: Legal and axis (cherry picked from commit 0d97775f7a1077862281e3858da6b2c899ea8790)
-rw-r--r--doc/src/modules.qdoc52
1 files changed, 47 insertions, 5 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index cf1e744..471ffc2 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -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
@@ -1011,9 +1011,9 @@
Copyright (c) 2009 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
*/
/*!