Skip to content

Commit 7aa2204

Browse files
committed
Add "Which branch" section
1 parent 919a2b5 commit 7aa2204

File tree

1 file changed

+39
-10
lines changed

1 file changed

+39
-10
lines changed

README.md

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,50 @@ What is PythonQt ?
1818
PythonQt is a dynamic Python binding for Qt. It offers an easy way to embed the Python
1919
scripting language into your Qt applications.
2020

21-
Prerequisites
22-
-------------
21+
Which branch ?
22+
--------------
23+
24+
Based on the Qt version your project is expected to support, you could use
25+
one of the branch referenced below:
26+
27+
| Supported Qt version | 4 | 5 |
28+
|------------------------|------------------------|------------------------|
29+
| Branch | [patched-6][patched-6] | [patched-8][patched-8] |
30+
| Base PythonQt revision | [r403][r403] | [r455][r455] |
31+
32+
33+
[patched-6]: https://github.com/commontk/PythonQt/tree/patched-6
34+
[r403]: http://sourceforge.net/p/pythonqt/code/403/
35+
36+
[patched-8]: https://github.com/commontk/PythonQt/tree/patched-8
37+
[r455]: http://sourceforge.net/p/pythonqt/code/455/
2338

24-
* CMake
25-
* Qt 4 or 5
2639

2740
Build instructions
2841
------------------
2942

30-
1. Checkout sources
43+
1. Install CMake and Qt
44+
45+
2. Checkout sources
3146

3247
```
3348
git clone git://github.com/commontk/PythonQt.git
34-
mkdir PythonQt-build
35-
cd PythonQt-build
3649
```
3750

38-
2. Configure
51+
3. Checkout branch
52+
53+
```
54+
git checkout -b patched-X origin/patched-X
55+
```
56+
57+
*See table above for exact branch name*
58+
59+
60+
4. Configure
61+
62+
```
63+
mkdir PythonQt-build && cd PythonQt-build
64+
```
3965

4066
* using Qt4:
4167

@@ -49,7 +75,7 @@ cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=/path/to/qmake ../PythonQt
4975
cmake -DQt5_DIR:PATH=/path/to/Qt5.X.Y/X.Y/compiler/lib/cmake/Qt5 ../PythonQt
5076
```
5177

52-
3. Build
78+
5. Build
5379

5480
```
5581
make
@@ -61,7 +87,7 @@ Additional configure options are:
6187
* `CMAKE_BUILD_TYPE`: Debug, Release, RelWithDebInfo or MinSizeRel
6288
* `PythonQt_DEBUG`: Enable/Disable PythonQt debug output
6389
* `PythonQt_Wrap_QtAll`: Make all Qt components available in python
64-
* `PythonQt_Wrap_Qt<componentname>`: Build PythonQt wrapper associated with `<componentname>`. Possible `<componentname>` are `gui`, `network`, `opengl`, `sql`, `uitools`, `webkit`, `xml`, `xmlpatterns`.
90+
* `PythonQt_Wrap_Qt<componentname>`: Build a specific PythonQt wrapper.
6591

6692
Available branches
6793
------------------
@@ -72,11 +98,14 @@ This repository contains 8 branches:
7298
* Based on [r455](http://sourceforge.net/p/pythonqt/code/455/) with:
7399
* revert of [r444](http://sourceforge.net/p/pythonqt/code/444/)
74100
* all changes from ``patched-7`` cherry-picked.
101+
* add support for build wrapping for Qml and Quick components
102+
* improve Qt5 support and remove Qt4 support
75103

76104
### patched-7
77105
* Based on [r443](http://sourceforge.net/p/pythonqt/code/443/) with:
78106
* partial revert of [r431](http://sourceforge.net/p/pythonqt/code/431/) to re-enable CMake support
79107
* all changes from ``patched-6`` cherry-picked.
108+
* add Qt5 support
80109

81110
### patched-6
82111
* Based on patched-5 + [r403](http://sourceforge.net/p/pythonqt/code/403/)

0 commit comments

Comments
 (0)