rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merged in filnet/librepilot/filnet/LP-125_path_utils_should_return_absolute_pathes (pull request #67)

Browse Source 
LP-125 PathUtils now returns absolute pathes again
This commit is contained in:
Philippe Renon 2015-09-22 15:31:15 +02:00
commit 67bba60f52
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ground/gcs/src/libs/utils/pathutils.cpp
View File

@ -43,8 +43,8 @@ QString GetDataPath()
dataPath += QLatin1Char('/'); dataPath += QLatin1Char('/');
dataPath += QLatin1String(DATA_REL_PATH); dataPath += QLatin1String(DATA_REL_PATH);
dataPath += QLatin1Char('/');
return dataPath; return QDir::cleanPath(dataPath) + QLatin1Char('/');
} }
/** /**
@ -131,8 +131,8 @@ QString GetLibraryPath()
libPath += QLatin1Char('/'); libPath += QLatin1Char('/');
libPath += QLatin1String(LIB_REL_PATH); libPath += QLatin1String(LIB_REL_PATH);
libPath += QLatin1Char('/');
return libPath; return QDir::cleanPath(libPath) + QLatin1Char('/');
} }
QStringList GetPluginPaths() QStringList GetPluginPaths()
@ -143,7 +143,8 @@ QStringList GetPluginPaths()
pluginPath += QLatin1Char('/'); pluginPath += QLatin1Char('/');
pluginPath += QLatin1String(PLUGIN_REL_PATH); pluginPath += QLatin1String(PLUGIN_REL_PATH);
rc.push_back(pluginPath);
rc.push_back(QDir::cleanPath(pluginPath));
return rc; return rc;
} }