Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

[Mac] Use ~/Library/Application Support/QupZilla as ConfigPath

Browse Source 
+ little cleanup in variable naming (homePath -> oldConfPath)

See #1302
This commit is contained in:
David Rosca 2014-04-26 12:22:16 +02:00
parent 5b25b4bda6
commit d29abb4e54
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/app/datapaths.cpp
View File

@ -112,20 +112,23 @@ void DataPaths::init()
} }
QDir confPath = QDir(dataLocation); QDir confPath = QDir(dataLocation);
QDir homePath = QDir(QDir::homePath() + QLatin1String("/.qupzilla")); QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.qupzilla"));
if (!homePath.exists()) { if (!oldConfPath.exists()) {
homePath = QDir::homePath() + QLatin1String("/.config/qupzilla"); oldConfPath = QDir::homePath() + QLatin1String("/.config/qupzilla");
} }
#elif defined(Q_OS_MAC)
QDir confPath = QDir(QDir::homePath() + QLatin1String("/Library/Application Support/QupZilla"));
QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla"));
#else // Unix #else // Unix
QDir confPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla")); QDir confPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla"));
QDir homePath = QDir(QDir::homePath() + QLatin1String("/.qupzilla")); QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.qupzilla"));
#endif #endif
if (homePath.exists() && !confPath.exists()) { if (oldConfPath.exists() && !confPath.exists()) {
m_paths[Config].append(homePath.absolutePath()); m_paths[Config].append(oldConfPath.absolutePath());
qWarning() << "WARNING: Using deprecated configuration path" << homePath.absolutePath(); qWarning() << "WARNING: Using deprecated configuration path" << oldConfPath.absolutePath();
qWarning() << "WARNING: This path may not be supported in future versions!"; qWarning() << "WARNING: This path may not be supported in future versions!";
qWarning() << "WARNING: Please move your configuration into" << confPath.absolutePath(); qWarning() << "WARNING: Please move your configuration into" << confPath.absolutePath();
} }