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

Replace obsolete enum datalocation #10927

Merged
merged 1 commit into from
Oct 1, 2022

Conversation

m0dB
Copy link
Contributor

@m0dB m0dB commented Sep 28, 2022

With Qt 6.3.2 QStandardPaths::DataLocation does not exist anymore. According to the Qt 5 docs this enum is the same as QStandardPaths::AppLocalDataLocation:

https://doc.qt.io/qt-5/qstandardpaths.html#StandardLocation-enum

which will work on all versions.

@github-actions github-actions bot added the build label Sep 28, 2022
@m0dB m0dB force-pushed the replace-obsolete-enum-datalocation branch from 1a23ad0 to 280ab0c Compare September 28, 2022 21:39
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

LGTM, thank you.

@Holzhaus
Copy link
Member

Could you rebase onto the 2.3 branch and change the PR base branch? Thanks!

@Holzhaus
Copy link
Member

Could you rebase onto the 2.3 branch and change the PR base branch? Thanks!

ping @m0dB 😄

…pLocalDataLocation, which is the same according to Qt docs
@m0dB m0dB force-pushed the replace-obsolete-enum-datalocation branch from 280ab0c to c8d2306 Compare September 30, 2022 22:19
@m0dB
Copy link
Contributor Author

m0dB commented Sep 30, 2022

@Holzhaus I hope I got this right. I did:
$ git rebase --onto 2.3 replace-obsolete-enum-datalocation~1 replace-obsolete-enum-datalocation
$ git push --force

@Holzhaus Holzhaus changed the base branch from main to 2.3 September 30, 2022 22:51
@Holzhaus Holzhaus merged commit af27d63 into mixxxdj:2.3 Oct 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants