Erros casused by all of the mergedd branches are now fixed for...

Erros casused by all of the mergedd branches are now fixed for qgroundcontrol.pro. Working on fixing the errors that now appeare in qgcunittest.pro.

libs/thirdParty/qserialport/src/common/qserialport.cpp

@@ -27,7 +27,7 @@
 # include <fcntl.h>
 # include <sys/ioctl.h>
 # include <errno.h>
-# include "posix/termioshelper.h"
+# include "../posix/termioshelper.h"
 #elif defined(TNX_WINDOWS_SERIAL_PORT)
 # include "win32/commdcbhelper.h"
 # include "win32/qwincommevtnotifier.h"

src/comm/QGCMAVLink.h

@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef QGCMAVLINK_H
 #define QGCMAVLINK_H
 
-#include <../../mavlink/include/mavlink/v1.0/common/mavlink.h>
+#include <mavlink.h>
 
 //#ifdef MAVLINK_CONF
 //#define MY_MACRO(x) <x>

src/uas/SlugsMAV.h

@@ -25,7 +25,7 @@ This file is part of the QGROUNDCONTROL project
 #define SLUGSMAV_H
 
 #include "UAS.h"
-#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "mavlink.h"
 #include <QTimer>
 
 #define SLUGS_UPDATE_RATE   200   // in ms

src/uas/UASWaypointManager.cc

@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 
 #include "UASWaypointManager.h"
 #include "UAS.h"
-#include "../../mavlink/include/mavlink/v1.0/mavlink_types.h"
+#include "mavlink_types.h"
 
 #define PROTOCOL_TIMEOUT_MS 2000    ///< maximum time to wait for pending messages until timeout
 #define PROTOCOL_DELAY_MS 20        ///< minimum delay between sent messages

src/uas/senseSoarMAV.h

@@ -4,7 +4,7 @@
 
 
 #include "UAS.h"
-#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "mavlink.h"
 #include <QTimer>
 
 

src/ui/DebugConsole.cc

@@ -35,7 +35,7 @@ This file is part of the QGROUNDCONTROL project
 #include "ui_DebugConsole.h"
 #include "LinkManager.h"
 #include "UASManager.h"
-#include "../../mavlink/include/mavlink/v1.0/protocol.h"
+#include "protocol.h"
 #include "QGC.h"
 
 #include <QDebug>

src/ui/SlugsDataSensorView.h

@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 
 #include "UASInterface.h"
 #include "SlugsMAV.h"
-#include "../../mavlink/include/mavlink/v1.0/common/mavlink.h"
+#include "mavlink.h"
 
 
 namespace Ui