Skip to content

use a different (fake) enum namespace for shiboken & shiboken2 #713

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.

Sign up for GitHub

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

Jump to bottom
Merged
devernay merged 1 commit into from
Dec 4, 2021
Merged

use a different (fake) enum namespace for shiboken & shiboken2 #713

devernay merged 1 commit into from
Dec 4, 2021

Conversation

@devernay
Copy link
Member

@devernay devernay commented Dec 3, 2021 •
edited
Loading

See discussion in #698:

  • Support for building with Shiboken2 in Engine #697 and Shiboken2 postmerge fixes in Engine #704 introduced changes that broke shiboken1.
  • we want to keep sbk1 compatibility as long as possible, because sbk2 means switching to Qt5, and this won't happen before 2.6 or 3.0
  • this PR fixes that, so that both shiboken1 and shiboken2 can be used.
  • it puts all enums in the fake NATRON_ENUM namespace, so that the shiboken/shiboken2-generated code is OK, and when compiling Natron this is defined to NATRON_NAMESPACE (see Global/Macros.h)

Things to watch for:

  • a lot of the pypanel_wrapper code is not generated anymore, why? same for a few other Gui classes

If this is merged, next operations are:

  • rework Support for building with Shiboken2 in Gui #698 the same way
  • move all shiboken-generated source files to Engine/Qt4/NatronEngine end Gui/Qt4/NatronGui
  • update instructions in INSTALL_LINUX and INSTALL_MACOS to regenerate these
  • generate shiboken1 and shiboken2 files, and check in the generated sources

@devernay devernay mentioned this pull request Dec 3, 2021
Merged
10 tasks
YakoYakoYokuYoku
YakoYakoYokuYoku approved these changes Dec 4, 2021
View reviewed changes
Copy link
Member

@YakoYakoYokuYoku YakoYakoYokuYoku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could generate the sources with both my Qt5 environment as well as a Qt4 devel VM box, you can go ahead.

@devernay devernay merged commit a42f0b3 into RB-2.5 Dec 4, 2021
@YakoYakoYokuYoku YakoYakoYokuYoku deleted the sbk2-engine-take2 branch June 18, 2022 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@YakoYakoYokuYoku YakoYakoYokuYoku YakoYakoYokuYoku approved these changes

Assignees

No one assigned

Labels

func:python

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@devernay @YakoYakoYokuYoku