Skip to content

Commit 2da3f74

Browse files
committed
Update README.md
1 parent f04eb5f commit 2da3f74

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

README.md

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ Which branch ?
2424
Based on the Qt version your project is expected to support, you could use
2525
one of the branch referenced below:
2626

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] |
27+
| Supported Qt version | 4 | 5 |
28+
|------------------------|------------------------|----------------------------------------|
29+
| Branch | [patched-6][patched-6] | [patched-9][patched-9] |
30+
| Base PythonQt revision | [r403][r403] | [MeVisLab/pythonqt@c07f09fd][c07f09fd] |
3131

3232

3333
[patched-6]: https://github.com/commontk/PythonQt/tree/patched-6
3434
[r403]: http://sourceforge.net/p/pythonqt/code/403/
3535

36-
[patched-8]: https://github.com/commontk/PythonQt/tree/patched-8
37-
[r455]: http://sourceforge.net/p/pythonqt/code/455/
36+
[patched-9]: https://github.com/commontk/PythonQt/tree/patched-9
37+
[c07f09fd]: https://github.com/MeVisLab/pythonqt/commit/c07f09fd
3838

3939

4040
Build instructions
@@ -92,16 +92,28 @@ Additional configure options are:
9292
Available branches
9393
------------------
9494

95-
This repository contains 8 branches:
95+
This repository contains 9 branches:
96+
97+
### patched-9
98+
* Based on [MeVisLab/pythonqt@c07f09fd](https://github.com/MeVisLab/pythonqt/commit/c07f09fd) with:
99+
* all changes from ``patched-8`` cherry-picked expect:
100+
* `Fix refcount problems seen when re-initializing Python after finalizing` already integrated as [MeVisLab/pythonqt@5e0d26c01ff](https://github.com/MeVisLab/pythonqt/commit/5e0d26c01ff) (`fixed ref counting of types`)
101+
* `Explicitly initialize global storage containers` already integrated as [MeVisLab/pythonqt@170d4a475](https://github.com/MeVisLab/pythonqt/commit/170d4a475) (`reimplemented argument frame caching (previous approach was not thread-safe when GIL is used)`)
102+
* `Expose QSocketNotifier for Qt5` already integrated as [MeVisLab/pythonqt@518765494d](https://github.com/MeVisLab/pythonqt/commit/518765494d) (`updated wrappers to contain QSocketNotifier and recent generator changes`)
103+
* Add support for building 511 wrappers
104+
* cmake: Add missing source file
96105

97106
### patched-8
98-
* Remove explicit setup of `INSTALL_NAME_DIR`. See PR [#59](https://github.com/commontk/PythonQt/pull/59)
99107
* Based on [r455](http://sourceforge.net/p/pythonqt/code/455/) with:
100108
* revert of [r444](http://sourceforge.net/p/pythonqt/code/444/)
101109
* all changes from ``patched-7`` cherry-picked.
102110
* add support for build wrapping for Qml and Quick components
103111
* improve Qt5 support and remove Qt4 support
112+
* Remove explicit setup of `INSTALL_NAME_DIR`. See PR [#59](https://github.com/commontk/PythonQt/pull/59)
104113
* add patch from @pieper fixing wrapping of `QSocketNotifier` (see [PR#63](https://github.com/commontk/PythonQt/pull/63) and [message](https://sourceforge.net/p/pythonqt/discussion/631392/thread/c989429c/) on PythonQt mailinglist)
114+
* Fix windows build error renaming stdout ivar
115+
* Add support for enabling stdout/stderr redirection
116+
* Fix setRedirectStdInCallbackEnabled
105117

106118
### patched-7
107119
* Based on [r443](http://sourceforge.net/p/pythonqt/code/443/) with:

0 commit comments

Comments
 (0)