Merge branch 'bugfix-ground'

ground/openpilotgcs/src/libs/libs.pro

@@ -6,10 +6,10 @@ SUBDIRS   = \
     qtconcurrent \
     aggregation \
     extensionsystem \
+    utils \
     opmapcontrol \
     qwt \
     qextserialport \
-    utils \
     glc_lib\
     sdlgamepad \
     libqxt

ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri

@@ -7,3 +7,4 @@ TEMPLATE = lib
 UI_DIR = uics
 MOC_DIR = mocs
 OBJECTS_DIR = objs
+INCLUDEPATH +=../../../../libs/

ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp

@@ -25,6 +25,7 @@
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include "cache.h"
+#include "utils/pathutils.h"
 #include <QSettings>
 
 namespace core {
@@ -53,11 +54,7 @@ namespace core {
     {
         if(cache.isNull()|cache.isEmpty())
         {
-            QSettings set(QSettings::IniFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"));
-            QDir dir(set.fileName());
-            QFileInfo f(dir.absolutePath());
-            f.dir().absolutePath();
-            cache=f.dir().absolutePath()+QDir::separator()+"mapscache"+QDir::separator();
+            cache= Utils::PathUtils().GetStoragePath()+"mapscache"+QDir::separator();
             setCacheLocation(cache);
         }
     }

ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro

@@ -15,11 +15,15 @@ SOURCES += mapgraphicitem.cpp \
     mapripform.cpp \
     mapripper.cpp \
     traillineitem.cpp
+
 LIBS += -L../build \
     -lcore \
     -linternals \
     -lcore
 
+# order of linking matters
+include(../../../utils/utils.pri)
+
 POST_TARGETDEPS  += ../build/libcore.a
 POST_TARGETDEPS  += ../build/libinternals.a
 

ground/openpilotgcs/src/libs/utils/utils.pri

@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(Utils)
+LIBS += -l$$qtLibraryTarget(Utils)