-
Notifications
You must be signed in to change notification settings - Fork 84
[patched-9] Backport recent changes from MeVisLab/pythonqt
(Part 2)
#88
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or 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
(cherry picked from commit MeVisLab/pythonqt@8769ef4)
… Python) (cherry picked from commit MeVisLab/pythonqt@2d72bc5)
(and in some cases document when classes were introduced) (cherry picked from commit MeVisLab/pythonqt@467d3c0)
Enum class values seem to have pretty generic names (as there is no danger of name clashes in C++, as they must always be prefixed with the enum class name). So add them to the enum type in Python too, so one can always write something like QActionGroup.ExclusionPolicy.None instead of QActionGroup.None. Ideally we wouldn't add the enum values to the parent class at all, but I don't want to break compatibility with older versions of PythonQt. (cherry picked from commit MeVisLab/pythonqt@c35d010)
One example I stumbled upon is QActionGroup.ExclusionPolicy.None, which is a syntax error. So from now on it will be QActionGroup.ExclusionPolicy.None_. (cherry picked from commit MeVisLab/pythonqt@77eba42)
- add missing modules for qt6 in CI (cherry picked from commit MeVisLab/pythonqt@c7a13c6)
(cherry picked from commit MeVisLab/pythonqt@e132d96)
that have become visible again after the argument type has changed from int to qsizetype (these are the variants that take a const char pointer and a size argument - this is not supported in Python, instead we use the variants with QByteArrayView argument) (cherry picked from commit MeVisLab/pythonqt@af3d2ee)
(cherry picked from commit MeVisLab/pythonqt@6b87553)
Backport note: Removed `.github/workflows/builddocs.yml` from original commit - updated Doxyfile to current doxygen version (using doxygen -u) - minor documentation fixes (cherry picked from commit MeVisLab/pythonqt@f2c49ad)
(cherry picked from commit MeVisLab/pythonqt@5a3506a)
(cherry picked from commit MeVisLab/pythonqt@47a0cf4)
- avoids accidental inclusion of system-defined include dirs (cherry picked from commit MeVisLab/pythonqt@d0ddad6)
…tions) Just so that there are no unknown rejected classes and enums in the log file for Qt 6.6. The support for some of the new classes might be incomplete. (cherry picked from commit MeVisLab/pythonqt@249e092)
- fixes commontk#60 (cherry picked from commit MeVisLab/pythonqt@e83dbed)
- closes commontk#52 (cherry picked from commit MeVisLab/pythonqt@8c371c0)
by putting the correct spelling in the package name in the typesystem files (cherry picked from commit MeVisLab/pythonqt@182df8d)
…ired This currently just contains global enums. The content of these wrappers will be added to the current package, and to the "Qt" package. Also look in global namespace wrappers for scope-less enum types (cherry picked from commit MeVisLab/pythonqt@e9197ec)
...not just when it is a enum class in C++. It seems PySide does this too. (cherry picked from commit MeVisLab/pythonqt@d059d72)
(cherry picked from commit MeVisLab/pythonqt@bc2b945)
* Remove spaces from environment variable setting because it only works without spaces (cherry picked from commit MeVisLab/pythonqt@aa132d2)
- also fix minor readme error (cherry picked from commit MeVisLab/pythonqt@97038fd)
- changed default Python version from 2.6 to 3.10 (cherry picked from commit MeVisLab/pythonqt@bf9432e)
This partially reverts 10a3e49 ("Qt6 compatibility fixes for core PythonQt library", 2023-08-21)
cc: @jamesobutler |
jamesobutler
approved these changes
Jan 31, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes these were the additional commits. Your other warning fix up commits also make sense.
MeVisLab/pythonqt
(Part 2)MeVisLab/pythonqt
(Part 2)
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.
Follow-up of #87 integrating remaining changes related to PythonQt library and PythonQt generator.