squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-22 08:27:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change QSettings to IniFormat on macOS. Closes #5770 #5808

Browse Source 
On macOS 10.12 Sierra, Apple changed the behaviour of CFPreferencesSetValue()
truncating data after a null character. https://bugreports.qt.io/browse/QTBUG-56344
Due to this, we have to move from native plist to IniFormat.
This commit is contained in:
Yez Ezey
2016-10-07 22:42:47 +09:00
committed by sledgehammer999
parent a790901691
commit 664664394c
4 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/upgrade.h
View File

@@ -156,7 +156,12 @@ bool upgrade(bool ask = true)
upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile));
// ****************************************************************************************
#ifdef Q_OS_MAC
// native .plist
QSettings *oldResumeSettings = new QSettings("qBittorrent", "qBittorrent-resume");
#else
QIniSettings *oldResumeSettings = new QIniSettings("qBittorrent", "qBittorrent-resume");
#endif
QString oldResumeFilename = oldResumeSettings->fileName();
QVariantHash oldResumeData = oldResumeSettings->value("torrents").toHash();
delete oldResumeSettings;
@@ -223,4 +228,29 @@ bool upgrade(bool ask = true)
return true;
}
#ifdef Q_OS_MAC
bool copyPlistToIni(const char *application)
{
QSettings iniFile(QSettings::IniFormat, QSettings::UserScope, "qBittorrent", application);
if (QFile::exists(iniFile.fileName())) return false; // We copy the contents of plist, only if inifile does not exist.
QSettings plistFile("qBittorrent", application);
if (!QFile::exists(plistFile.fileName())) return false;
plistFile.setFallbacksEnabled(false);
const QStringList plist = plistFile.allKeys();
foreach (const QString &key, plist) {
iniFile.setValue(key, plistFile.value(key));
}
return true;
}
void macSalvagePlists()
{
copyPlistToIni("qBittorrent-data");
copyPlistToIni("qBittorrent-rss");
copyPlistToIni("qBittorrent");
}
#endif // Q_OS_MAC
#endif // UPGRADE_H