Fix import/export GlobalCollectionView settings

(cherry picked from commit e3c0e311)

core/calendar/exportcalendarjob.cpp

@@ -157,6 +157,13 @@ void ExportCalendarJob::backupConfig()
             Utils::convertCollectionListToRealPath(group, selectionKey);
         }
 
+        const QString globalCollectionViewStr(QStringLiteral("GlobalCollectionView"));
+        if (korganizerConfig->hasGroup(globalCollectionViewStr)) {
+            KConfigGroup group = korganizerConfig->group(globalCollectionViewStr);
+            const QString selectionKey(QStringLiteral("Expansion"));
+            convertCollectionListToRealPath(group, selectionKey);
+        }
+
         korganizerConfig->sync();
         backupFile(tmp.fileName(), Utils::configsPath(), korganizerStr);
         delete korganizerConfig;

core/calendar/importcalendarjob.cpp

@@ -295,6 +295,7 @@ void ImportCalendarJob::importkorganizerConfig(const KArchiveFile *file, const Q
 
     convertCollectionListStrToAkonadiId(korganizerConfig, QStringLiteral("GlobalCollectionSelection"), QStringLiteral("Selection"), true);
     convertCollectionListStrToAkonadiId(korganizerConfig, QStringLiteral("CollectionTreeView"), QStringLiteral("Expansion"), true);
+    convertCollectionListStrToAkonadiId(korganizerConfig, QStringLiteral("GlobalCollectionView"), QStringLiteral("Expansion"), true);
 
     korganizerConfig->sync();
 }