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.
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)
What does this pull request do?
It removes Qt4 related code and build logic from the 2.6 branch. It also removes all conditional code inclusion based on QT_VERSION and requires that we build with Qt version 5.15.3 or greater. This greatly simplifies the code and will make it easier to do a Qt6 port. It also paves the way for simplifying our shiboken/pyside usage since we won't have to cater to the Qt4 versions of these tools.
This change does not introduce any new code. It simply removes build logic, #ifdefs, and files that are no longer needed. It essentially produces "identical" builds to what our GitHub actions for Windows and Linux were already producing. Both platforms build with a version of Qt 5.15.3 or greater.
Have you tested your changes (if applicable)? If so, how?
Yes. I did several builds as I worked on the various commits to ensure that I did not break anything.
https://github.com/acolwell/Natron/actions/runs/8350544964
https://github.com/acolwell/Natron/actions/runs/8350727509
https://github.com/acolwell/Natron/actions/runs/8350958614
https://github.com/acolwell/Natron/actions/runs/8350963516
https://github.com/acolwell/Natron/actions/runs/8353432203
https://github.com/acolwell/Natron/actions/runs/8353465758
I also took a Windows installer from the final build and did a bunch of ad-hoc testing to ensure that everything still appeared to work. I didn't notice any issues. This testing was by no means exhaustive, but since I'm not changing any functionality I don't really expect any new bugs to be introduced by this change.
Futher details of this pull request
I split this change into commits that each have a particular focus. The intent was to make this a little easier to review. I specifically targeted Qt 5.15.x because it allowed the elimination of all the #ifdefs and it is the version that makes it easiest to port to Qt6. I also see little benefit in supporting earlier versions of Qt 5 given that we build the code ourselves and distribute all our dependencies, including Qt, with it.