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.

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

Introduce wrapper for non const iterators for erase and insert #12201

Merged
merged 1 commit into from Oct 22, 2023
Merged

Introduce wrapper for non const iterators for erase and insert #12201

merged 1 commit into from Oct 22, 2023

Conversation

daschuer
Copy link
Member

This should fix the build failure in Qt6 and Qt5

daschuer referenced this pull request Oct 20, 2023
@ronso0
Pref Mixer: use constInsert() and constErase() to fix clazy warnings
920fa8a
@daschuer daschuer force-pushed the nonConstErase branch 3 times, most recently from 363b0e2 to 6bb420f Compare October 20, 2023 22:39
@daschuer
Copy link
Member Author

All Green finally. It builds on Qt5 as well.
The windows issue is the cake issue fixed in 2.4.

@uklotzde
Copy link
Contributor

Could someone please fix the Qt5 build for main? This is an inconvenient situation and should be resolved asap.

The Qt6 build still crashes on startup for me.

@ronso0
Copy link
Member

ronso0 commented Oct 22, 2023

That's what this PR is about, right?
Someone needs to approve the changes and merge.

Swiftb0y
Swiftb0y approved these changes Oct 22, 2023
View reviewed changes
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM as a stopgap solution. Though we should really get rid of it again once we are fully on Qt6.

@Swiftb0y Swiftb0y merged commit c4204d2 into mixxxdj:main Oct 22, 2023
12 of 13 checks passed
@ronso0
Copy link
Member

ronso0 commented Oct 24, 2023

Thanks @daschuer !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Swiftb0y Swiftb0y Swiftb0y approved these changes

Assignees
No one assigned
Labels
preferences ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@daschuer @uklotzde @ronso0 @Swiftb0y