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

Qt6 switch #11892

Merged
merged 11 commits into from Aug 30, 2023
Merged

Qt6 switch #11892

merged 11 commits into from Aug 30, 2023

Conversation

daschuer
Copy link
Member

This switches the main branch to Qt6.

@daschuer
Copy link
Member Author

The failing Tests on windows are:

 The following tests FAILED:
	146 - CoverArtCacheTest.loadCoverFromFileRelative (Failed)
	147 - CoverArtCacheTest.loadCoverFromFileAbsolute (Failed)
	148 - CoverArtUtilTest.extractEmbeddedCover (Failed)
	149 - CoverArtUtilTest.searchImage (Failed)
	749 - TrackUpdateTest.parseModifiedCleanOnce (Failed)
	750 - TrackUpdateTest.parseModifiedCleanAgainSkipCover (Failed)
	751 - TrackUpdateTest.parseModifiedCleanAgainUpdateCover (Failed)
	752 - TrackUpdateTest.parseModifiedDirtyAgain (Failed)

Could this be related to:
#11131

Since the CI on main is broken anyway, we can merge this to have testing build for macOS and fix the Windows issue in a separate PR. It would be interesting if local builds with the same setup have the same issue.

@Holzhaus
Copy link
Member

I think we also need to cherry-pick this commit: cdfead8

Because Qt6 does not contain ANGLE anymore.

@Holzhaus
Copy link
Member

daschuer#93

Disable broken tests and skip ANGLE DLL install on Windows
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. Waiting for CI.

@Holzhaus Holzhaus merged commit 50d9858 into mixxxdj:main Aug 30, 2023
12 of 13 checks passed
@daschuer daschuer deleted the qt6_switch branch September 6, 2023 05:38
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.

None yet

2 participants