github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-21 11:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: rearranged Qv2rayAssetsPaths

Browse Source
This commit is contained in:
QxQ 2020-09-20 11:21:36 +08:00
parent f894f07f81
commit 3a513385b8
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5919
5920

20
src/base/Qv2rayBase.hpp
View File

@ -107,25 +107,26 @@ namespace Qv2ray
{
inline QStringList Qv2rayAssetsPaths(const QString &dirName)
{
#define makeAbs(p) QDir(p).absolutePath()
// Configuration Path
QStringList list;
list << QV2RAY_CONFIG_DIR + dirName;
list << makeAbs(QV2RAY_CONFIG_DIR + dirName);
list << ":/" + dirName;
//
#ifdef Q_OS_LINUX
// Linux platform directories.
list << QString("/lib/qv2ray/" + dirName);
list << QString("/usr/lib/qv2ray/" + dirName);
list << QString("/usr/local/lib/qv2ray/" + dirName);
list << makeAbs("/usr/local/lib/qv2ray/" + dirName);
list << makeAbs("/usr/lib/qv2ray/" + dirName);
list << makeAbs("/lib/qv2ray/" + dirName);
//
list << QString("/usr/share/qv2ray/" + dirName);
list << QString("/usr/local/share/qv2ray/" + dirName);
list << makeAbs("/usr/local/share/qv2ray/" + dirName);
list << makeAbs("/usr/share/qv2ray/" + dirName);
// For AppImage?
list << QString(QDir(QCoreApplication::applicationDirPath() + "/../share/qv2ray/" + dirName).absolutePath());
list << makeAbs(QCoreApplication::applicationDirPath() + "/../share/qv2ray/" + dirName);
// For Snap
if (qEnvironmentVariableIsSet("SNAP"))
{
list << QString(qEnvironmentVariable("SNAP") + "/usr/share/qv2ray/" + dirName);
list << makeAbs(qEnvironmentVariable("SNAP") + "/usr/share/qv2ray/" + dirName);
}
#elif defined(Q_OS_MAC)
// macOS platform directories.
@ -134,9 +135,10 @@ namespace Qv2ray
list << QStandardPaths::locateAll(QStandardPaths::AppDataLocation, dirName, QStandardPaths::LocateDirectory);
list << QStandardPaths::locateAll(QStandardPaths::AppConfigLocation, dirName, QStandardPaths::LocateDirectory);
// This is the default behavior on Windows
list << QCoreApplication::applicationDirPath() + "/" + dirName;
list << makeAbs(QCoreApplication::applicationDirPath() + "/" + dirName);
list.removeDuplicates();
return list;
#undef makeAbs
}
} // namespace Qv2ray