Update qtmain library license information

The qtmain library is now available under commercial licenses, too.

Furthermore remove license from table with 3rd party code - it is
already linked to under 'Additional Information'. Finally, fix
description, and remove incorrect reference to 'QAxContainer'.

Change-Id: I8a5ee2af54676260289a94524ef4bb080d94ec55
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 28 insertions, 15 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 872a0bf19..b867f2929 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -75,6 +75,12 @@
     \title GNU Lesser General Public License, version 3
 */
 
+
+/*!
+    \externalpage https://spdx.org/licenses/BSD-3-Clause.html
+    \title BSD 3-clause "New" or "Revised" License
+*/
+
 /*!
     \externalpage http://qt-project.org/faq/answer/how_to_compress_data_with_qt
     \title How to compress data with Qt?
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 99b7b382d..4c626e310 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -91,8 +91,6 @@
     \row \li \l{QUrl::fromUserInput}{QUrl} \li Implementation of QUrl::fromUserInput(). \li Modified BSD \li
     \row \li \l{Contributions to the Cocoa Platform Plugin Files}{Cocoa Platform Plugin}
          \li Specific parts of the Qt for macOS Cocoa port. \li BSD-style \li \l{Qt for macOS}
-    \row \li \l{The qtmain Library}{qtmain library}
-         \li A helper library for writing a cross-platform main() function on Windows. \li Modified BSD \li \l{Qt for Windows}
     \row \li \l{Shift-JIS Text Codec}
          \li A character encoding for Japanese. \li BSD-style\li
     \row \li \l{ISO-2022-JP (JIS) Text Codec}
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index cef92b3ee..1587b1fd1 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
 */