Merge branch 'master' of https://github.com/mavlink/qgroundcontrol

qgroundcontrol.pro

@@ -767,8 +767,7 @@ HEADERS += \
 	src/qgcunittest/FlightModeConfigTest.h \
 	src/qgcunittest/FlightGearTest.h \
 	src/qgcunittest/TCPLinkTest.h \
-	src/qgcunittest/TCPLoopBackServer.h \
-	src/qgcunittest/QGCUASFileManagerTest.h
+	src/qgcunittest/TCPLoopBackServer.h
 
 SOURCES += \
 	src/qgcunittest/UASUnitTest.cc \
@@ -780,5 +779,4 @@ SOURCES += \
 	src/qgcunittest/FlightModeConfigTest.cc \
 	src/qgcunittest/FlightGearTest.cc \
 	src/qgcunittest/TCPLinkTest.cc \
-	src/qgcunittest/TCPLoopBackServer.cc \
-	src/qgcunittest/QGCUASFileManagerTest.cc
+	src/qgcunittest/TCPLoopBackServer.cc