From 99b2bb00f884da3c999cfff6647f423d2d415f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?= Date: Fri, 15 Dec 2023 16:29:51 +0100 Subject: doc: clarify the commercial and lts releases Fixes: PYSIDE-2558 Pick-to: 6.5 6.2 Change-Id: Ia606fe3b5734927c296ca89df674ef9cd1615b22 Reviewed-by: Shyamnath Premnadh (cherry picked from commit 4c7425c88cf372d797094228d148b17b2dbf9fd5) Reviewed-by: Qt Cherry-pick Bot --- sources/pyside6/doc/commercial/index.rst | 11 +++++++---- sources/pyside6/doc/contents.rst | 2 +- sources/pyside6/doc/quickstart.rst | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sources/pyside6/doc/commercial/index.rst b/sources/pyside6/doc/commercial/index.rst index 6c4266a12..33c88cfec 100644 --- a/sources/pyside6/doc/commercial/index.rst +++ b/sources/pyside6/doc/commercial/index.rst @@ -1,7 +1,7 @@ .. _commercial-page: -Commercial Distribution -======================= +Commercial Use +============== |project| follows the same licensing that Qt has, which means that there are two distributions, the Community Edition (LGPLv3/GPLv3) and a Commercial Edition. For @@ -19,11 +19,14 @@ The only difference is that the ADP license **does not** include the extra ``Qt OPC UA``, ``Qt MQTT`` and ``Qt CoAP`` modules, which are distributed in a special Python wheel. -All commercial licenses include the 5.15.x and 6.2.x LTS releases. +|project| follows the same approach as Qt, meaning that commercial +users will have access to both our commercial packages for any +given version, or the special commercial LTS releases. Commercial users **should not** install the Community Edition distribution via ``pip install pyside6`` to avoid licensing problems, and should refer to the -packages provided in the `Qt Account`_. +packages that can be acquired from the `Qt Account`_, the Qt Installer, or +via the `qtpip` tool. Installation ------------ diff --git a/sources/pyside6/doc/contents.rst b/sources/pyside6/doc/contents.rst index 0208cae82..04203a53e 100644 --- a/sources/pyside6/doc/contents.rst +++ b/sources/pyside6/doc/contents.rst @@ -4,6 +4,7 @@ :maxdepth: 2 quickstart.rst + commercial/index.rst gettingstarted/index.rst api.rst tutorials/index.rst @@ -12,7 +13,6 @@ deployment/index.rst considerations.rst developer/index.rst - commercial/index.rst .. Intersphinx references in toctrees is not supported diff --git a/sources/pyside6/doc/quickstart.rst b/sources/pyside6/doc/quickstart.rst index e5b13cc4a..7e1a210f2 100644 --- a/sources/pyside6/doc/quickstart.rst +++ b/sources/pyside6/doc/quickstart.rst @@ -28,6 +28,8 @@ Before you can install |project|, first you must install the following software: Installation ------------ +.. note:: For a commercial installation, refer to :ref:`commercial-page`. + * **Creating and activating an environment** You can do this by running the following on a terminal: -- cgit v1.2.3