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

Renovate QString splits with newer enum in Gui #725

Merged
merged 1 commit into from
Dec 14, 2021

Conversation

YakoYakoYokuYoku
Copy link
Member

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?

QString::SplitBehaviour has been deprecated in Qt 5 and Qt::SplitBehaviour is recommended instead.

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

N/A.

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

Built Natron and used the node graph editor.

Futher details of this pull request

N/A.

Copy link
Member

@devernay devernay left a comment

Choose a reason for hiding this comment

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

what about

#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
#define QtSkipEmptyParts Qt::SkipEmptyParts
#else
#define QtSkipEmptyParts QString::SkipEmptyParts
#endif

?

@YakoYakoYokuYoku
Copy link
Member Author

I'm not gonna do that due to only a few of the sources uses the SplitBehaviour enum member and that I don't want to use preprocessor defines, so that we can just delete the obsolete portions in one swoop.

@devernay
Copy link
Member

ok I'm fine with either solution

@YakoYakoYokuYoku YakoYakoYokuYoku merged commit 789599f into RB-2.5 Dec 14, 2021
@YakoYakoYokuYoku YakoYakoYokuYoku deleted the qstring-split-renov branch December 14, 2021 18:15
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.

2 participants