Skip to content
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

Improvements before Qt6 #1020

Merged
merged 4 commits into from
Dec 19, 2024
Merged

Improvements before Qt6 #1020

merged 4 commits into from
Dec 19, 2024

Conversation

YakoYakoYokuYoku
Copy link
Member

@YakoYakoYokuYoku YakoYakoYokuYoku commented Dec 17, 2024

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?

This adds a pair of corrections in the build system needed for landing Qt6 support, they affect mostly the Python bindings generation and are backwards compatible with Qt5.

Show a few screenshots (if this is a visual change)

N/A.

Have you tested your changes (if applicable)? If so, how?

By building and running Natron.

Futher details of this pull request

This is a stopgap before #1019 can be merged.

@YakoYakoYokuYoku
Copy link
Member Author

Will merge tomorrow if no objections are raised.

Copy link
Collaborator

@acolwell acolwell left a comment

Choose a reason for hiding this comment

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

In general I'm supportive of these changes and just have a few comments

Engine/CMakeLists.txt Outdated Show resolved Hide resolved
Gui/CMakeLists.txt Show resolved Hide resolved
Gui/typesystem_natronGui.xml Show resolved Hide resolved
Engine/AppInstance.h Show resolved Hide resolved
tools/utils/runPostShiboken2.sh Show resolved Hide resolved
@YakoYakoYokuYoku YakoYakoYokuYoku merged commit 436a8c1 into RB-2.6 Dec 19, 2024
3 of 7 checks passed
@devernay
Copy link
Member

@YakoYakoYokuYoku please avoid force-pushing without an approval from the reviewer, except for minor stuff (e.g. typo, or 1-line trivial fix), even if you addressed the reviewer's comments. There's no hurry in merging in general.

acolwell added a commit to acolwell/Natron that referenced this pull request Dec 19, 2024
- Fixes build breakages caused by PR NatronGitHub#1020
acolwell added a commit to acolwell/Natron that referenced this pull request Dec 19, 2024
- Fixes build breakages caused by PR NatronGitHub#1020
acolwell added a commit to acolwell/Natron that referenced this pull request Dec 20, 2024
- Fixes build breakages caused by PR NatronGitHub#1020
@acolwell acolwell mentioned this pull request Dec 20, 2024
10 tasks
YakoYakoYokuYoku pushed a commit that referenced this pull request Dec 20, 2024
- Fixes build breakages caused by PR #1020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants