Resolved merge conflict

qgroundcontrol.pri

@@ -301,7 +301,8 @@ win32-msvc2008|win32-msvc2010|win32-msvc2012 {
 
 	INCLUDEPATH += $$BASEDIR/libs/lib/sdl/msvc/include \
         $$BASEDIR/libs/lib/opal/include \
-        $$BASEDIR/libs/lib/msinttypes
+        $$BASEDIR/libs/lib/msinttypes \
+        $$(QTDIR)/src/activeqt/shared
 
 	LIBS += -L$$BASEDIR/libs/lib/sdl/msvc/lib \
         -lSDLmain -lSDL \

qgroundcontrol.pro

@@ -62,13 +62,14 @@ win32 {
     QMAKE_RCC = "$$(QTDIR)/bin/rcc.exe"
     QMAKE_QMAKE = "$$(QTDIR)/bin/qmake.exe"
 	
-        # Build QAX for GoogleEarth API access
-        !exists( $(QTDIR)/src/activeqt/Makefile ) {
-                message( Making QAx (ONE TIME) )
-                system( cd $$(QTDIR)\\src\\activeqt && $$(QTDIR)\\bin\\qmake.exe )
-                system( cd $$(QTDIR)\\src\\activeqt\\container && $$(QTDIR)\\bin\\qmake.exe )
-                system( cd $$(QTDIR)\\src\\activeqt\\control && $$(QTDIR)\\bin\\qmake.exe )
-        }
+	# Build QAX for GoogleEarth API access
+	!exists( $(QTDIR)/src/activeqt/Makefile ) {
+		message( Making QAx (ONE TIME) )
+		system( cd $$(QTDIR)\\src\\activeqt && $$(QTDIR)\\bin\\qmake.exe )
+		system( cd $$(QTDIR)\\src\\activeqt\\container && $$(QTDIR)\\bin\\qmake.exe )
+		system( cd $$(QTDIR)\\src\\activeqt\\control && $$(QTDIR)\\bin\\qmake.exe )
+                system( cd $$(QTDIR)\\src\\activeqt && nmake )
+	}
 }
 
 

src/uas/ArduPilotMegaMAV.cc

@@ -28,12 +28,12 @@ This file is part of the QGROUNDCONTROL project
 
 #include "ArduPilotMegaMAV.h"
 
-#ifndef mavlink_mount_configure_t
+#ifndef MAVLINK_MSG_ID_MOUNT_CONFIGURE
 #include "ardupilotmega/mavlink_msg_mount_configure.h"
 #endif
 
-#ifndef mavlink_mount_control_t
-#include "ardupilotmega/mavlink_msg_mount_control.h";
+#ifndef MAVLINK_MSG_ID_MOUNT_CONTROL
+#include "ardupilotmega/mavlink_msg_mount_control.h"
 #endif
 
 ArduPilotMegaMAV::ArduPilotMegaMAV(MAVLinkProtocol* mavlink, int id) :

src/ui/PrimaryFlightDisplay.cpp

@@ -546,17 +546,17 @@ void PrimaryFlightDisplay::drawAIAirframeFixedFeatures(QPainter& painter, QRectF
     qreal h = area.height();
 
     QPen pen;
-    pen.setWidthF(lineWidth * 1.5);
+    pen.setWidthF(lineWidth * 1.5f);
     pen.setColor(redColor);
     painter.setPen(pen);
 
-    float length = 0.15;
-    float side = 0.5;
+    float length = 0.15f;
+    float side = 0.5f;
     // The 2 lines at sides.
     painter.drawLine(QPointF(-side*w, 0), QPointF(-(side-length)*w, 0));
     painter.drawLine(QPointF(side*w, 0), QPointF((side-length)*w, 0));
 
-    float rel = length/qSqrt(2);
+    float rel = length/qSqrt(2.0f);
     // The gull
     painter.drawLine(QPointF(rel*w, rel*w/2), QPoint(0, 0));
     painter.drawLine(QPointF(-rel*w, rel*w/2), QPoint(0, 0));