From cb854480c445177fc82fc9d0571055c7fa2fc4fe Mon Sep 17 00:00:00 2001
From: lm <mail@qgroundcontrol.org>
Date: Sat, 16 Jul 2011 20:47:20 +0200
Subject: [PATCH] Fixed issue with wrong MAVLinkGen configuration

---
 qgroundcontrol.pro                                   | 5 +++--
 src/apps/mavlinkgen/mavlinkgen.pri                   | 2 +-
 src/libs/opmapcontrol/src/mapwidget/mapresources.qrc | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index c49f065f3..dbc017889 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -58,7 +58,8 @@ DEPENDPATH += \
     src/libs/utils \
     src/libs/utils/src \
     src/libs/opmapcontrol \
-    src/libs/opmapcontrol/src
+    src/libs/opmapcontrol/src \
+    src/libs/opmapcontrol/src/mapwidget
 
 INCLUDEPATH += \
     src/libs/utils \
@@ -83,7 +84,7 @@ BUILDDIR = $$TARGETDIR/build
 LANGUAGE = C++
 OBJECTS_DIR = $$BUILDDIR/obj
 MOC_DIR = $$BUILDDIR/moc
-UI_HEADERS_DIR = src/ui/generated
+UI_HEADERS_DIR = $$BUILDDIR/ui
 MAVLINK_CONF = ""
 
 # If the user config file exists, it will be included.
diff --git a/src/apps/mavlinkgen/mavlinkgen.pri b/src/apps/mavlinkgen/mavlinkgen.pri
index 8b8370053..8270518b4 100644
--- a/src/apps/mavlinkgen/mavlinkgen.pri
+++ b/src/apps/mavlinkgen/mavlinkgen.pri
@@ -39,4 +39,4 @@ SOURCES += \
     generator/MAVLinkXMLParser.cc \
     ui/QGCMAVLinkTextEdit.cc
 
-RESOURCES = mavlinkgen.qrc
+RESOURCES += mavlinkgen.qrc
diff --git a/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc b/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc
index b7a0b985c..cfb7f5131 100644
--- a/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc
+++ b/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc
@@ -2,7 +2,6 @@
     <qresource prefix="/markers">
         <file>images/bigMarkerGreen.png</file>
         <file>images/marker.png</file>
-        <file>images/compas.svg</file>
         <file>images/airplane.svg</file>
         <file>images/home.png</file>
         <file>images/home.svg</file>
@@ -12,6 +11,7 @@
         <file>images/mapquad.png</file>
         <file>images/dragons1.jpg</file>
         <file>images/dragons2.jpeg</file>
+        <file>images/compas.svg</file>
     </qresource>
     <qresource prefix="/uavs">
         <file>images/airplanepip.png</file>
-- 
2.22.0