Orochimarufan / PythonQt

PythonQt fork featuring Qt 5.x and Python 3.x support and improved CMake build system
GNU Lesser General Public License v2.1
48 stars 20 forks source link

My changes to PythonQt #1

Closed melven closed 10 years ago

melven commented 10 years ago

Hello Orochimarufan,

I've tried to merge all my changes to PythonQt into your fork. These contain mostly support for python-docstrings (can be generated using decorator functions, see PyExampleDecorators) and some adjustments to the qmake-project files.

If you could merge the changes we may ask Florian Link if he reintegrates them into the official PythonQt as I would prefer not to maintain my own version of PythonQt.

I've also tried your CMake-build system with qt4/5 python2/3 and it works like a charm.

Regards, Melven

Orochimarufan commented 10 years ago

Sorry for taking so long to reply,

I've skimmed over your changes:

And, if it's not too much trouble, could you separate the bullet points in your first commit into their own commits?

Also, it's good to see the qmake build getting fixed ;)

As for merging into upstream, I haven't had a response from upstream since I created the fork (August of last year) so I don't really know if there's going to be much action in that regard. It might however be a good idea to see about merging with the other forks here on GitHub (https://github.com/commontk/PythonQt/network)

Right now, I don't really have a use for PythonQt in an active project so I'm not working on it, but that might change in the relatively near future

Regards, Oro

melven commented 10 years ago

Hello Oro,

thanks for your helpful remarks. I actually merged your modifications into our PythonQt repository (not at bitbucket) and then merged the results back, which actually also caused some unintended modifications. So I did a bit of rebasing and modified the changes:

Concerning the commontk-forks there might be some interesting changes too; however, I have currently not a real idea how the commontk-forks differs from your/my version.

Regards, Melven