aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md33
-rw-r--r--README.pyside6.md2
2 files changed, 7 insertions, 28 deletions
diff --git a/README.md b/README.md
index 10a418775..8b7de90c5 100644
--- a/README.md
+++ b/README.md
@@ -24,16 +24,16 @@ The same setup.py script is used to build all the components of the project:
* PySide6
Preferably, a Qt (build) environment should be used to automatically pick up
-the associated `qmake`, but optionally one can specify the location of `qmake`
+the associated `qtpaths6`, but optionally one can specify the location of `qtpaths6`
and `cmake` if it is not in the current PATH with:
- * `--qmake=/path/to/qt/bin/qmake`, and
+ * `--qtpaths=/path/to/qt/bin/qtpaths6`, and
* `--cmake=/path/to/bin/cmake`
respectively.
By default, all of the above is built when no special options are passed to the
-script. You can use the --build-type parameter to specify which things should
+script. You can use the `--build-type` parameter to specify which things should
be built:
* `--build-type=shiboken6`, build/package only the python module
@@ -69,27 +69,6 @@ You can use the option `--rpath=/path/to/lib/path` to specify which rpath
values should be embedded into the PySide6 modules and shared libraries. This
overrides the automatically generated values when the option is not specified.
-You can use the option `--only-package` if you want to create more binary
-packages (bdist_wheel, bdist_egg, ...) without rebuilding the entire project
-every time:
-
-e.g.:
-
-* First, we create a bdist_wheel from a full PySide6 build:
- ```
- python setup.py bdist_wheel --qmake=c:\Qt\6.0\bin\qmake.exe
- --cmake=c:\tools\cmake\bin\cmake.exe
- --openssl=c:\libs\OpenSSL32bit\bin
- ```
-* Then, we create a bdist_egg reusing the PySide6 build with option
- `--only-package`:
- ```
- python setup.py bdist_egg --only-package
- --qmake=c:\Qt\6.0\bin\qmake.exe
- --cmake=c:\tools\cmake\bin\cmake.exe
- --openssl=c:\libs\OpenSSL32bit\bin
- ```
-
You can use the option `--qt-conf-prefix` to pass a path relative to the
PySide6 installed package, which will be embedded into an auto-generated
`qt.conf` registered in the Qt resource system. This path will serve as the
@@ -140,8 +119,8 @@ using `setup.py build`:
* Python 3.7+ is supported,
* CMake: Specify the path to cmake with `--cmake` option or add cmake to the
system path.
- * Qt 6.0+ is supported. Specify the path to qmake with `--qmake` option or
- add qmake to the system path.
+ * Qt 6.2+ is supported. Specify the path to qtpaths with `--qtpaths` option or
+ add `qtpaths6` to the system path.
### Optional
@@ -224,7 +203,7 @@ make sure to specify the following things:
* `LLVM_INSTALL_DIR`, the environment variable should point to your libclang
library location
* `Qt`, either select a Qt Kit when configuring the project, or make sure that
- the qmake binary is present in the PATH environment variable.
+ the `qtpaths6` binary is present in the PATH environment variable.
* `Python`, the PATH environment variable should also point to the Python
interpreter which you wish to use for building the projects (can either be
a system interpreter, or a virtualenv one for example)
diff --git a/README.pyside6.md b/README.pyside6.md
index fe22602af..53dbe79e0 100644
--- a/README.pyside6.md
+++ b/README.pyside6.md
@@ -66,7 +66,7 @@ then install the dependencies, and following the instructions per platform.
A common build command will look like:
```
-python setup.py install --qmake=/path/to/bin/qmake --parallel=8 --build-tests
+python setup.py install --qtpaths=/path/to/bin/qtpaths6 --parallel=8 --build-tests
```
You can obtain more information about the options to build PySide and Shiboken