flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T103, executable file path moved to CDirectoryUtils::executableFilePath

Browse Source
This commit is contained in:
Klaus Basan
2017-07-06 23:56:11 +02:00
committed by Mathew Sutcliffe
parent 3245ff4ef4
commit caf358401f
5 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/directoryutils.cpp
View File

@@ -45,6 +45,23 @@ namespace BlackMisc
return pDir;
}
QString CDirectoryUtils::executableFilePath(const QString &executable)
{
Q_ASSERT_X(!executable.isEmpty(), Q_FUNC_INFO, "Missing executable file path");
Q_ASSERT_X(CBuildConfig::isKnownExecutableName(executable), Q_FUNC_INFO, "Unknown exectuable");
QString s = CFileUtils::appendFilePaths(CDirectoryUtils::binDirectory(), executable);
if (CBuildConfig::isRunningOnMacOSXPlatform() && CDirectoryUtils::isMacOSXAppBundle())
{
s += QLatin1String(".app/Contents/MacOS/") + executable;
}
else if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
s += QLatin1String(".exe");
}
return s;
}
QString normalizedApplicationDirectoryImpl()
{
QString appDir = CDirectoryUtils::binDirectory();

3
src/blackmisc/directoryutils.h
View File

@@ -34,6 +34,9 @@ namespace BlackMisc
//! Plugins directory
static const QString &pluginsDirectory();
//! The executable file path
static QString executableFilePath(const QString &executable);
//! swift application data directory, contains 0..n swift installation directories
static const QString &applicationDataDirectory();