Skip to content

[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
merged 26 commits into from
Jan 31, 2024

Conversation

jcfr
Copy link
Member

@jcfr jcfr commented Jan 31, 2024

Follow-up of #87 integrating remaining changes related to PythonQt library and PythonQt generator.

usiems and others added 26 commits January 28, 2024 14:06
(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)
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)
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)
- 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)
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)
* Remove spaces from environment variable setting because it only works without spaces

(cherry picked from commit MeVisLab/pythonqt@aa132d2)
- 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)
@jcfr
Copy link
Member Author

jcfr commented Jan 31, 2024

cc: @jamesobutler

Copy link

@jamesobutler jamesobutler left a 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.

@jcfr jcfr merged commit 0580304 into commontk:patched-9 Jan 31, 2024
@jcfr jcfr deleted the patched-9 branch January 31, 2024 03:13
@jcfr jcfr changed the title Backport recent changes from MeVisLab/pythonqt (Part 2) [patched-9] Backport recent changes from MeVisLab/pythonqt (Part 2) Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants