Skip to content

Commit 9fcb650

Browse files
committed
doc: update Qt 5 references from README
This change updates all the references we had in the README files pointing to Qt5, PySide2, and old URLs. Pick-to: 6.0 Change-Id: I9512522418df0c3996031333180e18aef03057ed Reviewed-by: Friedemann Kleint <[email protected]>
1 parent 817fae3 commit 9fcb650

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ e.g.:
7777

7878
* First, we create a bdist_wheel from a full PySide6 build:
7979
```
80-
python setup.py bdist_wheel --qmake=c:\Qt\5.12\bin\qmake.exe
80+
python setup.py bdist_wheel --qmake=c:\Qt\6.0\bin\qmake.exe
8181
--cmake=c:\tools\cmake\bin\cmake.exe
8282
--openssl=c:\libs\OpenSSL32bit\bin
8383
```
8484
* Then, we create a bdist_egg reusing the PySide6 build with option
8585
`--only-package`:
8686
```
8787
python setup.py bdist_egg --only-package
88-
--qmake=c:\Qt\5.15\bin\qmake.exe
88+
--qmake=c:\Qt\6.0\bin\qmake.exe
8989
--cmake=c:\tools\cmake\bin\cmake.exe
9090
--openssl=c:\libs\OpenSSL32bit\bin
9191
```
@@ -137,10 +137,10 @@ using `setup.py build`:
137137

138138
## Requirements
139139

140-
* Python 3.6+ are supported,
140+
* Python 3.6+ is supported,
141141
* CMake: Specify the path to cmake with `--cmake` option or add cmake to the
142142
system path.
143-
* Qt 5.12+ is supported. Specify the path to qmake with `--qmake` option or
143+
* Qt 6.0+ is supported. Specify the path to qmake with `--qmake` option or
144144
add qmake to the system path.
145145

146146
### Optional
@@ -152,7 +152,7 @@ platforms.
152152

153153
Please note that official Windows packages do not ship the OpenSSL libraries
154154
due to import/export restrictions as described in
155-
http://doc.qt.io/qt-5/ssl.html#import-and-export-restrictions
155+
http://doc.qt.io/qt-6/ssl.html#import-and-export-restrictions
156156

157157
You can specify the location of the OpenSSL DLLs with the following option:
158158
`--openssl=</path/to/openssl/bin-directory>`.

README.pyside6.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
### Introduction
44

5+
**Important:** for Qt5 compatibility, check [PySide2](https://pypi.org/project/PySide2)
6+
57
PySide6 is the official Python module from the
68
[Qt for Python project](http://wiki.qt.io/Qt_for_Python),
7-
which provides access to the complete Qt 5.12+ framework.
9+
which provides access to the complete Qt 6.0+ framework.
810

911
The Qt for Python project is developed in the open, with all facilities you'd expect
1012
from any modern OSS project such as all code in a git repository and an open
@@ -23,8 +25,8 @@ pip install PySide6
2325

2426
#### Dependencies
2527

26-
PySide6 versions following 5.12 use a C++ parser based on
27-
[Clang](http://clang.org/). The Clang library (C-bindings), version 6.0 or
28+
PySide6 versions following 6.0 use a C++ parser based on
29+
[Clang](http://clang.org/). The Clang library (C-bindings), version 10.0 or
2830
higher is required for building. Prebuilt versions of it can be downloaded from
2931
[download.qt.io](http://download.qt.io/development_releases/prebuilt/libclang/).
3032

@@ -46,21 +48,20 @@ SET LLVM_INSTALL_DIR=%CD%\libclang
4648
### Building from source
4749

4850
For building PySide6 from scratch, please read about
49-
[getting started](https://wiki.qt.io/Qt_for_Python/GettingStarted).
51+
[getting started](https://doc.qt.io/qtforpython/gettingstarted.html).
5052
This process will include getting the code:
5153

5254
```
5355
git clone https://code.qt.io/pyside/pyside-setup
5456
cd pyside-setup
55-
git branch --track 5.14 origin/5.15
56-
git checkout 5.15
57+
git checkout 6.x # if a specific version is needed
5758
```
5859

5960
then install the dependencies, and following the instructions per platform.
6061
A common build command will look like:
6162

6263
```
63-
python setup.py install --qmake=path/to/qmake/ --parallel=8 --build-tests
64+
python setup.py install --qmake=/path/to/bin/qmake --parallel=8 --build-tests
6465
```
6566

6667
You can obtain more information about the options to build PySide and Shiboken

README.shiboken6.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Shiboken6 module
22

3-
The purpose of the [shiboken6 Python module](https://wiki.qt.io/Qt_for_Python/Shiboken)
3+
The purpose of the **shiboken6 Python module**
44
is to access information related to the binding generation that could be used to integrate
55
C++ programs to Python, or even to get useful information to debug
66
an application.

0 commit comments

Comments
 (0)