From c5ef1a65f2cb29cd0cad4b5929ffe81f2305f2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 15 Feb 2023 12:31:56 +0100 Subject: Doc: Fix name of qt-everywhere package We don't have dedicated opensource and commercial packages anymore since years. Change-Id: I6cb19493249e7d0362a3fcb2ca30b052e874c7db Reviewed-by: Andreas Eliasson Reviewed-by: Paul Wicking (cherry picked from commit 01f85e0be80d7d7a8d8e5bd24427ac741207fefd) Reviewed-by: Qt Cherry-pick Bot --- doc/src/platforms/linux.qdoc | 4 ++-- doc/src/platforms/macos.qdoc | 4 ++-- doc/src/snippets/code/doc_src_emb-install.qdoc | 8 ++++---- doc/src/snippets/code/doc_src_installation.qdoc | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index f62d1b3a..63cb742e 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -358,12 +358,12 @@ \section1 Step 1: Unpacking the Archive Unpack the archive if you have not done so already. For example, - if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz} + if you have the \c{qt-everywhere-src-%VERSION%.tar.gz} package, type the following commands at a command line prompt: \snippet snippets/code/doc_src_installation.qdoc 0 - This creates the directory \c{/tmp/qt-everywhere-opensource-src-%VERSION%} + This creates the directory \c{/tmp/qt-everywhere-src-%VERSION%} containing the files from the archive. We only support the GNU version of the tar archiving utility. Note that on some systems it is called gtar. diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc index 2aefe2a1..1e8a51a9 100644 --- a/doc/src/platforms/macos.qdoc +++ b/doc/src/platforms/macos.qdoc @@ -295,12 +295,12 @@ \section2 Step 1: Unpack the Archive Unpack the archive if you have not done so already. For example, - if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz} + if you have the \c{qt-everywhere-src-%VERSION%.tar.gz} package, type the following commands at a command line prompt: \snippet snippets/code/doc_src_installation.qdoc 11 - This creates the directory \c{/tmp/qt-everywhere-opensource-src-%VERSION%} + This creates the directory \c{/tmp/qt-everywhere-src-%VERSION%} containing the files from the archive. \section2 Step 2: Build the Qt Library diff --git a/doc/src/snippets/code/doc_src_emb-install.qdoc b/doc/src/snippets/code/doc_src_emb-install.qdoc index 86f53d0c..3c211a70 100644 --- a/doc/src/snippets/code/doc_src_emb-install.qdoc +++ b/doc/src/snippets/code/doc_src_emb-install.qdoc @@ -3,13 +3,13 @@ //! [0] cd -gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz -tar xf qt-everywhere-opensource-src-%VERSION%.tar +gunzip qt-everywhere-src-%VERSION%.tar.gz +tar xf qt-everywhere-src-%VERSION%.tar //! [0] //! [1] -~/qt-everywhere-opensource-src-%VERSION% +~/qt-everywhere-src-%VERSION% //! [1] @@ -18,7 +18,7 @@ tar xf qt-everywhere-opensource-src-%VERSION%.tar //! [embedded help] //! [2] -cd ~/qt-everywhere-opensource-src-%VERSION% +cd ~/qt-everywhere-src-%VERSION% ./configure -embedded [architecture] //! [2] diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 033fcb44..285abeee 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -3,13 +3,13 @@ //! [0] cd /tmp -gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz # uncompress the archive -tar xvf qt-everywhere-opensource-src-%VERSION%.tar # unpack it +gunzip qt-everywhere-src-%VERSION%.tar.gz # uncompress the archive +tar xvf qt-everywhere-src-%VERSION%.tar # unpack it //! [0] //! [1] -cd /tmp/qt-everywhere-opensource-src-%VERSION% +cd /tmp/qt-everywhere-src-%VERSION% ./configure //! [1] @@ -42,13 +42,13 @@ setenv PATH /usr/local/Qt-%VERSION%/bin:$PATH //! [11] cd /tmp -gunzip qt-everywhere-opensource-src-%VERSION%.tar.gz # uncompress the archive -tar xvf qt-everywhere-opensource-src-%VERSION%.tar # unpack it +gunzip qt-everywhere-src-%VERSION%.tar.gz # uncompress the archive +tar xvf qt-everywhere-src-%VERSION%.tar # unpack it //! [11] //! [12] -cd /tmp/qt-everywhere-opensource-src-%VERSION% +cd /tmp/qt-everywhere-src-%VERSION% ./configure //! [12] -- cgit v1.2.1