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 some deprecated types to be able compile with Qt6 #4

Merged
merged 2 commits into from Jun 6, 2023

Conversation

jmlich
Copy link
Contributor

@jmlich jmlich commented May 26, 2023

QList to QSet is now done via constructor instead of .toSet() QRegExp is replaced by QRegularExpression

QList<QString> to QSet<QString> is now done via constructor instead of .toSet()
QRegExp is replaced by QRegularExpression
@@ -99,13 +99,13 @@ void SortFilterModel::setFilterRegExp(const QString &exp)
if (exp == filterRegExp()) {
return;
}
QSortFilterProxyModel::setFilterRegExp(QRegExp(exp, Qt::CaseInsensitive));
QSortFilterProxyModel::setFilterRegularExpression(QRegularExpression(exp, QRegularExpression::CaseInsensitiveOption));
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't compile on qt 5.6. Seems to be added in 5.12. -> should have some #iffing to support also older qt

@jmlich
Copy link
Contributor Author

jmlich commented May 30, 2023

I see, I have tried only with Qt 5.15 and Qt 6. I will fix it.

@pvuorela pvuorela merged commit 1e1ac33 into sailfishos:master Jun 6, 2023
@jmlich
Copy link
Contributor Author

jmlich commented Jun 6, 2023

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants