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

fix ParserCSV build errors with Qt6 #4394

Merged
merged 2 commits into from
Oct 13, 2021
Merged

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented Oct 13, 2021

No description provided.

// Using UTF-8 to get around codepage issues
// and it's the default encoding in Ooo Calc
// UTF-8 is the default in Qt6.
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Copy link
Contributor

Choose a reason for hiding this comment

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

The comment should be better replaced by a debug assertion:
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
DEBUG_ASSERT(out.encoding() == QStringConverter::Utf8);
#else
out.setCodec("UTF-8");
#endif

The implict conversion from QString to QFileInfo has been removed in
Qt6.
Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

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

LGTM

@uklotzde uklotzde merged commit e36f63f into mixxxdj:main Oct 13, 2021
@Be-ing Be-ing deleted the parsercsv_qt6 branch October 13, 2021 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants