diff options
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 97983392..485385b7 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -38,25 +38,34 @@ \page qtmain.html \title The qtmain Library \ingroup licensing - \brief Describes the use and license of the qtmain helper library. + \brief Commercial and \l{BSD 3-clause "New" or "Revised" License}. 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 \l{CMake Manual}{CMake}, then you - need to link against the \c qtmain library. + If you do not use \l qmake or other build tools such as + \l{CMake Manual}{CMake}, then you need to link against the + \c qtmain library. - \section1 License Information + The qtmain library is statically linked with the application. + To avoid issues with static linking and the + \l{GNU Lesser General Public License (LGPL)}, + it is licensed both under the commercial licenses, + and the \l{BSD 3-clause "New" or "Revised" License}. - The QAxContainer module is not covered by the \l{GNU General Public License (GPL)}, - the \l{GNU Lesser General Public License (LGPL)}, or the - \l{Qt Commercial License}. Instead, it is distributed under - the following license. + \section1 License Information - \legalese - Copyright (C) 2015 The Qt Company Ltd.\br - Contact: http://www.qt.io/licensing/ + \badcode + 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 The Qt Company. For licensing terms + and conditions see https://www.qt.io/terms-conditions. For further + information use the contact form at https://www.qt.io/contact-us. - You may use this file under the terms of the BSD license as follows: + BSD License Usage + Alternatively, 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 @@ -83,5 +92,5 @@ 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 + \endcode */ |