From 0bb71cd5df49b2b72d0e6edaa2f789be104637fe Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 19 Sep 2015 18:51:37 +0200 Subject: [PATCH] LP-125 PathUtils now returns absolute pathes again --- ground/gcs/src/libs/utils/pathutils.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ground/gcs/src/libs/utils/pathutils.cpp b/ground/gcs/src/libs/utils/pathutils.cpp index a3f66ce7f..212045401 100644 --- a/ground/gcs/src/libs/utils/pathutils.cpp +++ b/ground/gcs/src/libs/utils/pathutils.cpp @@ -43,8 +43,8 @@ QString GetDataPath() dataPath += QLatin1Char('/'); dataPath += QLatin1String(DATA_REL_PATH); - dataPath += QLatin1Char('/'); - return dataPath; + + return QDir::cleanPath(dataPath) + QLatin1Char('/'); } /** @@ -131,8 +131,8 @@ QString GetLibraryPath() libPath += QLatin1Char('/'); libPath += QLatin1String(LIB_REL_PATH); - libPath += QLatin1Char('/'); - return libPath; + + return QDir::cleanPath(libPath) + QLatin1Char('/'); } QStringList GetPluginPaths() @@ -143,7 +143,8 @@ QStringList GetPluginPaths() pluginPath += QLatin1Char('/'); pluginPath += QLatin1String(PLUGIN_REL_PATH); - rc.push_back(pluginPath); + + rc.push_back(QDir::cleanPath(pluginPath)); return rc; }