iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Align path construction in Utils::systemDir() and Utils::helper()

Browse Source 
Always handle the construction of the path in the same way no matter which OS
Cantata is built for, and only then pass the complete path to Utils::fixPath().
This commit is contained in:
Thomas Uhle
2020-04-08 14:11:01 +02:00
parent efa907c8e0
commit a6da2401c5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -5,6 +5,7 @@
3. Correctly set 'storeLyricsInMpdDir' config item, UI was setting wrong config
item.
4. Set minimum Qt5 version to 5.11
7. Align path construction in Utils::systemDir() and Utils::helper()
2.4.1
-----

8
support/utils.cpp
View File

@@ -782,11 +782,11 @@ QString Utils::cacheDir(const QString &sub, bool create)
QString Utils::systemDir(const QString &sub)
{
#if defined Q_OS_WIN
return fixPath(QCoreApplication::applicationDirPath())+(sub.isEmpty() ? QString() : (sub+constDirSep));
return fixPath(QCoreApplication::applicationDirPath()+constDirSep+(sub.isEmpty() ? QString() : (sub+constDirSep)));
#elif defined Q_OS_MAC
return fixPath(QCoreApplication::applicationDirPath())+QLatin1String("../Resources/")+(sub.isEmpty() ? QString() : (sub+constDirSep));
return fixPath(QCoreApplication::applicationDirPath()+QLatin1String("/../Resources/")+(sub.isEmpty() ? QString() : (sub+constDirSep)));
#else
return fixPath(QString(SHARE_INSTALL_PREFIX"/")+QCoreApplication::applicationName()+constDirSep+(sub.isEmpty() ? QString() : sub));
return fixPath(QString(SHARE_INSTALL_PREFIX"/")+QCoreApplication::applicationName()+constDirSep+(sub.isEmpty() ? QString() : (sub+constDirSep)));
#endif
}
@@ -802,7 +802,7 @@ QString Utils::helper(const QString &app)
if (QFile::exists(local)) {
return local;
}
return QString(INSTALL_PREFIX "/" LINUX_LIB_DIR "/")+QCoreApplication::applicationName()+constDirSep+app;
return fixPath(QString(INSTALL_PREFIX "/" LINUX_LIB_DIR "/")+QCoreApplication::applicationName()+constDirSep)+app;
#endif
}