rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Revert change for opmaplib, causes linking problems on Windows.

Browse Source
This commit is contained in:
elafargue 2011-05-09 16:48:46 +02:00
parent 262cc805b0
commit 822017953e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri
View File

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

7
ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp
View File

@ -25,7 +25,6 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "cache.h" #include "cache.h"
#include "utils/pathutils.h"
#include <QSettings> #include <QSettings>
namespace core { namespace core {
@ -54,7 +53,11 @@ namespace core {
{ {
if(cache.isNull()|cache.isEmpty()) if(cache.isNull()|cache.isEmpty())
{ {
cache= Utils::PathUtils().GetStoragePath()+"mapscache"+QDir::separator(); 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();
setCacheLocation(cache); setCacheLocation(cache);
} }
} }

3
ground/openpilotgcs/src/libs/opmapcontrol/src/core/core.pro
View File

@ -1,8 +1,5 @@
include (../common.pri) include (../common.pri)
include(../../../utils/utils.pri)
SOURCES += opmaps.cpp \ SOURCES += opmaps.cpp \
pureimagecache.cpp \ pureimagecache.cpp \
pureimage.cpp \ pureimage.cpp \