From 5362fc0b6ac0e776b4b3921aa2a3efb72873917b Mon Sep 17 00:00:00 2001
From: Oleg Shparber <oleg@zealdocs.org>
Date: Thu, 4 Apr 2019 01:16:34 -0400
Subject: [PATCH] fix(core): ignore fixed font size setting when migrating from
 0.6.0

The actual bug was fixed back in 0.6.1 (#903).

Fixes #1054.
---
 src/libs/core/settings.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp
index d3f81c53a..24dd69cd8 100644
--- a/src/libs/core/settings.cpp
+++ b/src/libs/core/settings.cpp
@@ -273,6 +273,18 @@ void Settings::migrate(QSettings *settings) const
     const QString version = settings->value(QStringLiteral("version")).toString();
     settings->endGroup();
 
+    //
+    // 0.6.0
+    //
+
+    // Unset content.default_fixed_font_size.
+    // The causing bug was 0.6.1 (#903), but the incorrect setting still comes to haunt us (#1054).
+    if (version == QLatin1String("0.6.0")) {
+        settings->beginGroup(GroupContent);
+        settings->remove(QStringLiteral("default_fixed_font_size"));
+        settings->endGroup();
+    }
+
     //
     // Pre 0.4
     //