X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=0ef3bc58c3a3d36bd5eabb2ea95dc086b5849935;hb=b8e812857ca64834078e1f620bf98fffa48b7768;hp=2b6b58c8c0f73a0d26d0a86eecbcf7a7c812f213;hpb=5f13dd167785d830a851b134863dce231ec450dd;p=quassel.git

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 2b6b58c8..0ef3bc58 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -21,6 +21,7 @@
 #include "qtuiapplication.h"
 
 #include <QIcon>
+#include <QDir>
 #include <QStringList>
 
 #ifdef HAVE_KDE4
@@ -210,6 +211,9 @@ bool QtUiApplication::migrateSettings()
     // --------
     // Check minor settings version, handling upgrades/downgrades as needed
     // Current minor version
+    //
+    // NOTE:  If you increase the minor version, you MUST ALSO add new version upgrade logic in
+    // applySettingsMigration()!  Otherwise, settings upgrades will fail.
     const uint VERSION_MINOR_CURRENT = 6;
     // Stored minor version
     uint versionMinor = s.versionMinor();
@@ -273,6 +277,8 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n
     //
     // In most cases, the goal is to preserve the older default values for keys that haven't been
     // saved.  Exceptions will be noted below.
+    // NOTE:  If you add new upgrade logic here, you MUST ALSO increase VERSION_MINOR_CURRENT in
+    // migrateSettings()!  Otherwise, your upgrade logic won't ever be called.
     case 6:
     {
         // New default changes: sender colors switched around to Tango-ish theme