Resolved unit test compile errors

qgcunittest.pro

@@ -72,10 +72,12 @@ contains(MAVLINK_CONF, ardupilotmega) {
     DEFINES += QGC_USE_ARDUPILOTMEGA_MESSAGES
 }
 
-# Include general settings for MAVGround
+# Include general settings for QGroundControl
 # necessary as last include to override any non-acceptable settings
 # done by the plugins above
 include(qgroundcontrol.pri)
+# Reset QMAKE_POST_LINK to prevent file copy operations
+QMAKE_POST_LINK = ""
 
 # QWT plot and QExtSerial depend on paths set by qgroundcontrol.pri
 # Include serial port library

src/uas/UASWaypointManager.cc

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #include "UASWaypointManager.h"
 #include "UAS.h"
 #include "mavlink_types.h"
-#include "MainWindow.h"
+//#include "MainWindow.h"
 
 #define PROTOCOL_TIMEOUT_MS 2000    ///< maximum time to wait for pending messages until timeout
 #define PROTOCOL_DELAY_MS 40        ///< minimum delay between sent messages
@@ -387,7 +387,8 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile)
 
     if (!(version.size() == 3 && version[0] == "QGC" && version[1] == "WPL" && version[2] == "100"))
     {
-        MainWindow::instance()->showCriticalMessage(tr("Error loading waypoint file"),tr("The waypoint file is not compatible with the current version of QGroundControl."));
+        emit updateStatusString(tr("The waypoint file is not compatible with the current version of QGroundControl."));
+        //MainWindow::instance()->showCriticalMessage(tr("Error loading waypoint file"),tr("The waypoint file is not compatible with the current version of QGroundControl."));
     }
     else
     {
@@ -401,7 +402,8 @@ void UASWaypointManager::loadWaypoints(const QString &loadFile)
             }
             else
             {
-                MainWindow::instance()->showCriticalMessage(tr("Error loading waypoint file"),tr("The waypoint file is corrupted. Load operation only partly succesful."));
+                emit updateStatusString(tr("The waypoint file is corrupted. Load operation only partly succesful."));
+                //MainWindow::instance()->showCriticalMessage(tr("Error loading waypoint file"),);
                 break;
             }
         }