Fix deprecated Qt 5.15 usage #9750
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
DonLakeFlyer
commented
Jul 7, 2021
| #define WEATHER_UPDATE_DISTANCE 50000 //-- 50km threshold for weather updates | ||
| #define WEATHER_UPDATE_TIME 30 * 60 * 60 * 1000 //-- 30 minutes threshold for weather updates | ||
| #define WEATHER_UPDATE_DISTANCE 50000 //-- 50km threshold for weather updates | ||
| #define WEATHER_UPDATE_TIME_MSECS 30 * 60 * 1000 //-- 30 minutes threshold for weather updates |
There was a problem hiding this comment.
As far as I can tell this value was incorrect. It is supposed to be milliseconds.
DonLakeFlyer
commented
Jul 7, 2021
| @@ -186,9 +186,9 @@ bool QJsonWebToken::setAlgorithmStr(QString strAlgorithm) | |||
| // set algorithm | |||
| m_strAlgorithm = strAlgorithm; | |||
| // modify header | |||
| m_jdocHeader = QJsonDocument::fromJson(QObject::trUtf8("{\"typ\": \"JWT\", \"alg\" : \"").toUtf8() | |||
| m_jdocHeader = QJsonDocument::fromJson(QStringLiteral("{\"typ\": \"JWT\", \"alg\" : \"").toUtf8() | |||
There was a problem hiding this comment.
This doesn't seem to need to use tr? Correct?
There was a problem hiding this comment.
what's the motivation to change it?
There was a problem hiding this comment.
I've never touched this code...AirMap didn't author it
There was a problem hiding this comment.
Oh, that's right. This is Gus' code. The calls in this pull are deprecated in Qt 5.15 and won't compile without warnings. These changes get rid of the warnings. This all should be fine then.
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.
No description provided.