From bba179912b2fcdd32b3cbd6e71df4442d1044fd7 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Fri, 27 Sep 2024 15:59:27 +0200
Subject: [PATCH] Doc: Add info about Qt Creator licenses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: QTCREATORBUG-31653
Change-Id: Ib203d428940eceb8bbbdecda731d077dc8163492
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
---
 doc/qtcreator/config/style/qt5-sidebar.html            |  2 +-
 .../src/howto/creator-only/creator-how-to-install.qdoc |  3 ++-
 .../src/overview/creator-acknowledgements.qdoc         | 10 ++++++++--
 doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc         |  2 +-
 doc/qtdesignstudio/src/qtdesignstudio.qdoc             |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html
index c5c9f62c161..e9bdbfb1da8 100644
--- a/doc/qtcreator/config/style/qt5-sidebar.html
+++ b/doc/qtcreator/config/style/qt5-sidebar.html
@@ -70,7 +70,7 @@
         <h2>Reference</h2>
     </div>
     <ul>
-        <li><a href="creator-acknowledgements.html">Acknowledgements</a></li>
+        <li><a href="creator-acknowledgements.html">Licenses and Acknowledgments</a></li>
         <li><a href="creator-cli.html">Command-Line Options</a></li>
         <li><a href="creator-project-wizards.html">Custom Wizards</a></li>
         <li><a href="creator-faq.html">FAQ</a></li>
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
index f64c870cfe0..fad52f18617 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
@@ -88,5 +88,6 @@
     {Compiling \QC} and \l{https://wiki.qt.io/Building_Qt_Creator_from_Git}
     {Building Qt Creator from Git}.
 
-    \sa {Manage Kits}{How To: Manage Kits}, {Register installed Qt versions}
+    \sa {Manage Kits}{How To: Manage Kits}, {Register installed Qt versions},
+    {Install plugins}, {Licenses and Acknowledgments}
 */
diff --git a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
index e69626b35cf..f1ccb416af0 100644
--- a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
+++ b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc
@@ -17,9 +17,15 @@
 
     \ingroup creator-reference
 
-    \title Acknowledgements
+    \title Licenses and Acknowledgments
 
-    \brief Third-party components in \QC.
+    \brief Licenses and third-party components in \QC.
+
+    \section1 Licenses
+
+    \QC is available under commercial licenses from The Qt Company, and
+    under the GNU General Public License version 3, annotated with
+    The Qt Company GPL Exception 1.0.
 
     \section1 Credits
 
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 6b3680de546..bb3b0dd7646 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -270,6 +270,6 @@
                 \li \l{Supported Platforms}
             \endlist
         \li \l{Technical Support}
-        \li \l{Acknowledgements}
+        \li \l{Licenses and Acknowledgments}
     \endlist
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index d3a0b007d12..a68d2ca1228 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -98,6 +98,6 @@
                 \uicontrol {System Information}.
 
                 For credits and a list of third-party libraries, see
-                \l {Acknowledgements}.
+                \l {Licenses and Acknowledgments}.
     \endtable
 */