Skip to content

fix ParserCSV build errors with Qt6#4394

Merged
uklotzde merged 2 commits intomixxxdj:mainfrom
Be-ing:parsercsv_qt6
Oct 13, 2021
Merged

fix ParserCSV build errors with Qt6#4394
uklotzde merged 2 commits intomixxxdj:mainfrom
Be-ing:parsercsv_qt6

Conversation

@Be-ing
Copy link
Copy Markdown
Contributor

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

No description provided.

Comment thread src/library/parsercsv.cpp Outdated
// 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
Copy Markdown
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
Copy Markdown
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