Skip to content

fix: don't override unstable version with the current alpha #15361

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.

Sign up for GitHub

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

Merged
JoergAtGithub merged 1 commit into from
Nov 22, 2025
Merged

fix: don't override unstable version with the current alpha #15361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/preferences/upgrade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,14 +628,18 @@ UserSettingsPointer Upgrade::versionUpgrade(const QString& settingsPath) {
// If additional upgrades are added for later versions, they should go before
// this block and cleanVersion should be bumped to the latest version.
const QVersionNumber cleanVersion(2, 6, 0);
if (QVersionNumber::fromString(configVersion) >= cleanVersion) {
if (QVersionNumber::fromString(configVersion) >= cleanVersion &&
configVersion != VersionStore::FUTURE_UNSTABLE) {
// No special upgrade required, just update the value.
configVersion = VersionStore::version();
config->set(ConfigKey("[Config]", "Version"), ConfigValue(VersionStore::version()));
}

if (configVersion == VersionStore::version()) {
qDebug() << "Configuration file is now at the current version" << VersionStore::version();
} else if (configVersion == VersionStore::FUTURE_UNSTABLE) {
qDebug() << "Configuration file is now at the unstable version"
<< VersionStore::FUTURE_UNSTABLE;
} else {
qWarning() << "Configuration file is at version" << configVersion
<< "instead of the current" << VersionStore::version();
Expand Down
Loading