diff options
author | Kai Köhne <kai.koehne@qt.io> | 2021-09-09 08:40:16 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2021-09-14 13:34:41 +0200 |
commit | 3ca984a91a73b38ec22861bd758202eb233d1abc (patch) | |
tree | 2efd455caf6728ccb19c5918dc756543525839c4 | |
parent | 0a6715cf226dcae49ff6fcafbf01a16487112d93 (diff) | |
download | qtdoc-3ca984a91a73b38ec22861bd758202eb233d1abc.tar.gz |
Doc: Recommend Strawberry instead of ActiveState perl
Both work, but ActiveState is currently moving to a very restrictive
license policy:
https://www.activestate.com/blog/important-changes-to-activestate-licensing-and-pricing-model-in-2021/
Actually nowadays also the msys perl from git work, so the warning
about the order of PATH is superfluous, too.
This fix is only for 5.15, because the page has been more or less
rewritten for Qt 6.
Change-Id: I3b7cf484313e3297f97080e8f43900330385c000
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | doc/src/platforms/windows.qdoc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 9a46bdb4..651083a8 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -443,18 +443,13 @@ for building Qt 5 from source. \list - \li \l ActivePerl - Install a recent version of ActivePerl - (\l{http://www.activestate.com/activeperl}{download page}) and add + \li \l Perl - Install a recent version of perl (for instance + (\l{https://strawberryperl.com/}{Strawberry Perl}) and add the installation location to your \c PATH. \li Python - Install Python from the \l{http://www.python.org/download/}{here} and add the installation location to your \c PATH. \endlist - \note Please make sure that the \c perl executable from ActivePerl is found - in the path before the perl executable provided by msysgit, since the - latter is outdated. - - ANGLE depends on these extra tools from the \l{GnuWin32 Project}{GnuWin32} and \l {http://sourceforge.net/projects/winflexbison/}{Win flex-bison} projects, which are provided for your convenience in the \e gnuwin32/bin |