New branch patched-5 (based on patched-4 + back ported upstream + add-qt5-support) #15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@246 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
…g from these classes, since they have private destructors git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@247 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@248 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
PythonQt_QT_VERSION cmake option is added ("4" or "5"). If "5",
PythonQt_Wrap_QtXYZ use a XYZ with the same Qt5 casing, if "4" it is lower
case, e.g. PythonQt_Wrap_QtWebKit vs PythonQt_Wrap_Qtwebkit
To be done:
* Rebase Qt5 support on PythonQt trunk (some changes in this commit
(e.g. in PythonQt.cpp) might not be due to a Qt5 support)
* Fix XmlPatterns
* Split generated_cpp folders regarding to Qt modules.
* Remove findCharOffset() and use QByteArray methods instead
* Bonus: Factorize method signature processings
* Fix warning:
src/PythonQtConversion.cpp: In static member function ‘static QVariant PythonQtConv::PyObjToQVariant(PyObject*, int)’:
src/PythonQtConversion.cpp:1044:27: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings]
Based on Melven Zöllner work (
http://sourceforge.net/p/pythonqt/discussion/631392/thread/5f20c176/)
…e filled to know if it is Qt4 or Qt5 which will be wrapped.
…) corresponding macros. Moreover, the Qt5_wrap_ui and qt5_add_resources macros are not found by default.
…AKE_PREFIX_PATH the path which contain all the Qt5* folders used by CMake to determine the configuration of the Qt5 modules.
… in the namespace Qt.
…rapped only if these modules are selected. NOTE: The way to do that is certainly not the best as the code created by the generator was modified manually by including lots a detection of symbols. The modification of the generator’s code should be certainly better (create folder and files dedicated to these modules), but the current way keep the compatibility with PythonQt for Qt4.x.
… the module is selected.
…ated with new modules to wrap.
…NCH_COMMAND variable.
…es in the folder ‘generated_cpp_50’ were modified.
jcfr
added a commit
to jcfr/PythonQt
that referenced
this pull request
Feb 18, 2016
Based on work from the following individual: * Melven Röhrig-Zöllner (https://sourceforge.net/p/pythonqt/discussion/631392/thread/5f20c176/) * Julien Finet (@finetjul): See commontk#38) * Arnaud Barre (@Alzathar):See commontk#15 * Eric Heim (@eric-h):See commontk#36
|
Most of commits in this PR are superseded by #39 I will close this PR after reviewing all other CMake tweaks and fixes. |
mwoehlke-kitware
pushed a commit
to mwoehlke-kitware/PythonQt
that referenced
this pull request
May 23, 2016
Based on work from the following individual: * Melven Röhrig-Zöllner (https://sourceforge.net/p/pythonqt/discussion/631392/thread/5f20c176/) * Julien Finet (@finetjul): See commontk#38) * Arnaud Barre (@Alzathar):See commontk#15 * Eric Heim (@eric-h):See commontk#36
|
Thanks again for the contribution. Now closing this PR. Most (if not all) changes have been integrated. |
jamesobutler
pushed a commit
to jamesobutler/PythonQt
that referenced
this pull request
Dec 12, 2023
Based on work from the following individual: * Melven Röhrig-Zöllner (https://sourceforge.net/p/pythonqt/discussion/631392/thread/5f20c176/) * Julien Finet (@finetjul): See commontk#38) * Arnaud Barre (@Alzathar):See commontk#15 * Eric Heim (@eric-h):See commontk#36
jamesobutler
pushed a commit
to jamesobutler/PythonQt
that referenced
this pull request
Dec 13, 2023
Based on work from the following individual: * Melven Röhrig-Zöllner (https://sourceforge.net/p/pythonqt/discussion/631392/thread/5f20c176/) * Julien Finet (@finetjul): See commontk#38) * Arnaud Barre (@Alzathar):See commontk#15 * Eric Heim (@eric-h):See commontk#36
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NOTE: This pull request requires to update the branch svn-mirror. See pull request #14. It should be better to create a new branch other than merging
patched-5intopatched-4, but it seems I cannot propose to create a branch in the upstream repository.(from the updated README.md file)
patched-5
PythonQt_QT_VERSIONto select the version of Qt to wrap (4 or 5)