Qt6 compatibility patch 2#397
Merged
Merged
Conversation
this patch resolves compatibility issues with QString::split() - QRegExp -> QRegularExpression migration (in split() cases only) QString::split() accepting QRegExp is not available in Qt 6 (also deprecated in Qt 5), so such cases must be migrated. there was only single such case, and it is 1:1 migration. - QString::SplitBehavior -> Qt::SplitBehavior migration QString::SplitBehavior is obsolete since Qt 5.14, and was completely removed in Qt 6. use new values in the codebase and introduce compatibility layer for the older Qt versions. these changes don't make build with Qt6 possible, but they don't hurt Qt5 build either, and still move Qt6 migration forward.
Contributor
Author
|
these changes are completely independent from the changes in the previous PR (#396) and can be merged in any order. this PR is also "micro PR" (as the previous one) - very few modified files with few changed lines. likely only one more PR will be created later to introduces the final changes (also minimal) to enable Qt6 builds. |
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
this patch resolves compatibility issues with QString::split()
QRegExp -> QRegularExpression migration (in split() cases only)
QString::split() accepting QRegExp is not available in Qt 6 (also deprecated in Qt 5), so such cases must be migrated. there was only single such case, and it is 1:1 migration.
QString::SplitBehavior -> Qt::SplitBehavior migration
QString::SplitBehavior is obsolete since Qt 5.14, and was completely removed in Qt 6. use new values in the codebase and introduce compatibility layer for the older Qt versions.
these changes don't make build with Qt6 possible, but they don't hurt Qt5 build either, and still move Qt6 migration forward.