Support for building with Qt 6 #641
Merged
Conversation
This file contains 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
There is setEncoding, but QTextStream now apparently uses UTF-8 (rather than the correct locale encoding) by default.
It's mostly the same except when it's being used with a member function pointer... which is exactly what we're doing here.
This code isn't used in ld-decode anyway.
It's used in two places. In the first case we can rearrange the code to avoid it altogether; in the second case, we need a version conditional, so we can also remove the remaining warning with Qt 5.15 too.
I've tested this against the current Git version of qwt, which hasn't been released or packaged yet -- so the directory names here might need to change later if I've not guessed what Debian will pick correctly.
atsampson
added
enhancement
ld-decode-tools
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 is the minimal set of changes to get ld-decode to build with Qt 6 (in addition to the usual Qt 5). I've not used it extensively, but the test suite passes and ld-analyse seems to work. There are still lots of deprecation warnings from the JsonWax code.
Note that this requires a Qt 6 version of qwt, which currently means building qwt 6.2 from Git.