diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-02-08 10:45:34 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-02-08 16:08:28 +0100 |
commit | e1aee5ff734387c6d1a91df0f17d022042f5d927 (patch) | |
tree | ce55c52fe740e226cbbf6b9773cb3d5c71cd0aa4 /sources | |
parent | 3103f4f2f2f8f2d11b492725171d3380b2ca9507 (diff) |
Documentation: Remove mentions of qmake
It is replaced by qtpaths.
Pick-to: 6.2
Task-number: PYSIDE-1814
Change-Id: I0aafa0a8ebfc6fc9fe4eb4887dc740c9ea0e5767
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
-rw-r--r-- | sources/pyside6/doc/gettingstarted-linux.rst | 8 | ||||
-rw-r--r-- | sources/pyside6/doc/gettingstarted-macOS.rst | 8 | ||||
-rw-r--r-- | sources/pyside6/doc/gettingstarted-windows.rst | 8 | ||||
-rw-r--r-- | sources/pyside6/doc/gettingstarted.rst | 8 | ||||
-rw-r--r-- | sources/shiboken6/doc/gettingstarted.rst | 10 |
5 files changed, 22 insertions, 20 deletions
diff --git a/sources/pyside6/doc/gettingstarted-linux.rst b/sources/pyside6/doc/gettingstarted-linux.rst index 34c22bd4d..dbd81c6dd 100644 --- a/sources/pyside6/doc/gettingstarted-linux.rst +++ b/sources/pyside6/doc/gettingstarted-linux.rst @@ -56,19 +56,19 @@ Checking out the version that we want to build, for example 6.0:: Building PySide ~~~~~~~~~~~~~~~ -Check your Qt installation path, to specifically use that version of qmake to build PySide. -for example, :command:`/opt/Qt/6.0.0/gcc_64/bin/qmake`. +Check your Qt installation path, to specifically use that version of qtpaths to build PySide. +for example, :command:`/opt/Qt/6.0.0/gcc_64/bin/qtpaths`. Build can take a few minutes, so it is recommended to use more than one CPU core:: - python setup.py build --qmake=/opt/Qt/6.0.0/gcc_64/bin/qmake --build-tests --ignore-git --parallel=8 + python setup.py build --qtpaths=/opt/Qt/6.0.0/gcc_64/bin/qtpaths --build-tests --ignore-git --parallel=8 Installing PySide ~~~~~~~~~~~~~~~~~ To install on the current directory, just run:: - python setup.py install --qmake=/opt/Qt/6.0.0/gcc_64/bin/qmake --build-tests --ignore-git --parallel=8 + python setup.py install --qtpaths=/opt/Qt/6.0.0/gcc_64/bin/qtpaths --build-tests --ignore-git --parallel=8 Test installation ~~~~~~~~~~~~~~~~~ diff --git a/sources/pyside6/doc/gettingstarted-macOS.rst b/sources/pyside6/doc/gettingstarted-macOS.rst index 1033bef78..2442bff56 100644 --- a/sources/pyside6/doc/gettingstarted-macOS.rst +++ b/sources/pyside6/doc/gettingstarted-macOS.rst @@ -57,19 +57,19 @@ Checking out the version that we want to build, for example, 6.0:: Building PySide ~~~~~~~~~~~~~~~ -Check your Qt installation path, to specifically use that version of qmake to build PySide. -for example, ``/opt/Qt/6.0.0/gcc_64/bin/qmake``. +Check your Qt installation path, to specifically use that version of qtpaths to build PySide. +for example, ``/opt/Qt/6.0.0/gcc_64/bin/qtpaths``. Build can take a few minutes, so it is recommended to use more than one CPU core:: - python setup.py build --qmake=/opt/Qt/6.0.0/gcc_64/bin/qmake --build-tests --ignore-git --parallel=8 + python setup.py build --qtpaths=/opt/Qt/6.0.0/gcc_64/bin/qtpaths --build-tests --ignore-git --parallel=8 Installing PySide ~~~~~~~~~~~~~~~~~ To install on the current directory, just run:: - python setup.py install --qmake=/opt/Qt/6.0.0/gcc_64/bin/qmake --build-tests --ignore-git --parallel=8 + python setup.py install --qtpaths=/opt/Qt/6.0.0/gcc_64/bin/qtpaths --build-tests --ignore-git --parallel=8 Test installation ~~~~~~~~~~~~~~~~~ diff --git a/sources/pyside6/doc/gettingstarted-windows.rst b/sources/pyside6/doc/gettingstarted-windows.rst index 72ad0e3b1..d2d93ca89 100644 --- a/sources/pyside6/doc/gettingstarted-windows.rst +++ b/sources/pyside6/doc/gettingstarted-windows.rst @@ -65,19 +65,19 @@ Checking out the version that we want to build, for example, 6.0:: Building PySide ~~~~~~~~~~~~~~~ -Check your Qt installation path, to specifically use that version of qmake to build PySide. -for example, ``E:\Qt\6.0.0\msvc2019_64\bin\qmake.exe``. +Check your Qt installation path, to specifically use that version of qtpaths to build PySide. +for example, ``E:\Qt\6.0.0\msvc2019_64\bin\qtpaths.exe``. Build can take a few minutes, so it is recommended to use more than one CPU core:: - python setup.py build --qmake=c:\path\to\qmake.exe --openssl=c:\path\to\openssl\bin --build-tests --ignore-git --parallel=8 + python setup.py build --qtpaths=c:\path\to\qtpaths.exe --openssl=c:\path\to\openssl\bin --build-tests --ignore-git --parallel=8 Installing PySide ~~~~~~~~~~~~~~~~~ To install on the current directory, just run:: - python setup.py install --qmake=c:\path\to\qmake.exe --openssl=c:\path\to\openssl\bin --build-tests --ignore-git --parallel=8 + python setup.py install --qtpaths=c:\path\to\qtpaths.exe --openssl=c:\path\to\openssl\bin --build-tests --ignore-git --parallel=8 Test installation ~~~~~~~~~~~~~~~~~ diff --git a/sources/pyside6/doc/gettingstarted.rst b/sources/pyside6/doc/gettingstarted.rst index 6b2ced6d4..b4b7da319 100644 --- a/sources/pyside6/doc/gettingstarted.rst +++ b/sources/pyside6/doc/gettingstarted.rst @@ -56,7 +56,7 @@ package manager (for example, `Raspbian`_ and `ArchlinuxARM`_). A normal building command will look like this:: - python setup.py install --qmake=/path/to/qmake \ + python setup.py install --qtpaths=/path/to/qtpaths \ --ignore-git \ --debug \ --build-tests \ @@ -91,7 +91,7 @@ Using the ``--build-tests`` option will enable us to run all the auto tests insi python testrunner.py test > testlog.txt -.. note:: On Windows, don't forget to have qmake in your path +.. note:: On Windows, don't forget to have qtpaths in your path (:command:`set PATH=E:\\\Path\\\to\\\Qt\\\6.0.0\\\msvc2019_64\\\bin;%PATH%`) You can also run a specific test (for example ``qpainter_test``) by running:: @@ -146,8 +146,8 @@ The system required ``libxml2`` and ``libxslt``, also on the Python environment, After installing ``graphviz``, the ``dot`` command needs to be in PATH, otherwise, the process will fail. Installing ``graphviz`` system-wide is also an option. -Since the process rely on a Qt installation, you need to specify where the ``qtbase`` directory -you will use with your ``qmake`` is located:: +Since the process relies on a Qt installation, you need to specify where the +``qtbase`` directory is located:: export QT_SRC_DIR=/path/to/qtbase diff --git a/sources/shiboken6/doc/gettingstarted.rst b/sources/shiboken6/doc/gettingstarted.rst index 6ab337680..aad03e7ff 100644 --- a/sources/shiboken6/doc/gettingstarted.rst +++ b/sources/shiboken6/doc/gettingstarted.rst @@ -25,13 +25,13 @@ Simple build If you need only Shiboken Generator, a simple build run would look like this:: # For the required libraries (this will also build the shiboken6 python module) - python setup.py install --qmake=/path/to/qmake \ + python setup.py install --qtpaths=/path/to/qtpaths \ --build-tests \ --verbose-build \ --internal-build-type=shiboken6 # For the executable - python setup.py install --qmake=/path/to/qmake \ + python setup.py install --qtpaths=/path/to/qtpaths \ --build-tests \ --verbose-build \ --internal-build-type=shiboken6-generator @@ -62,11 +62,13 @@ via ``pip``:: The ``whl`` package cannot automatically discover in your system the location for: * Clang installation, -* ``qmake`` location with the same version as the one described in the wheel, +* Qt location (indicated by the path of the ``qtpaths`` tool) with the same + version/build as the one described in the wheel, * Qt libraries with the same package version. So using this process requires you to manually modify the variables: * ``CLANG_INSTALL_DIR`` must be set to where the libraries are, -* ``PATH`` must include the location for a ``qmake`` with the same Qt version as the package, +* ``PATH`` must include the location for the ``qtpaths`` tool with the same Qt + version as the package, * ``LD_LIBRARY_PATH`` including the Qt libraries and Clang libraries paths. |