Fix config data migration from 2.8 to 2.9 #8860
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
TheOneRing
reviewed
Aug 3, 2021
src/gui/application.cpp
Outdated
|
|
||
| // note: this change is temporary to allow using QDesktopServices etc. to determine the paths | ||
| // the application name was changed to | ||
| const auto oldApplicationName = app->applicationName(); |
There was a problem hiding this comment.
Maybe a inner scope with a QScopeGuard to reset the app name
TheOneRing
reviewed
Aug 3, 2021
src/gui/application.cpp
Outdated
| qCWarning(lcApplication) << "Failed to move the old config directory to its new location (" << oldDir << "to" << confDir << ")"; | ||
|
|
||
| // Try to move the files one by one | ||
| if (QFileInfo(confDir).isDir() || QDir().mkdir(confDir)) { |
There was a problem hiding this comment.
While touching this, maybe https://doc.qt.io/qt-5/qdir.html#entryInfoList-1 instead of manually constructing the path.
QDir().mkdir(confDir) will try to create confDir in the current working dir 😲 I'd say that never worked.
added 2 commits
August 6, 2021 17:04
QApplication::applicationName() is not necessarily stable, as its value has changed a lot (e.g., from 2.8 to 2.9). Therefore, using it should be avoided. The theme allows using both short and GUI name explicitly.
This commit adds a migration path for migrations from 2.8 to 2.9. It uses the exact same mechanism implemented for migrations from 2.4 and before, but extends it into a loop that iterates over all possible old config locations.
TheOneRing
approved these changes
Aug 6, 2021
|
Kudos, SonarCloud Quality Gate passed! |
20 tasks
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.
Closes #8824.