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

qgroundcontrol.pro

@@ -750,38 +750,35 @@ SOURCES += \
 
 #
 # Unit Test specific configuration goes here
-#
-# FIXME: These files should only be enabled on the Debug build, but that is currently broken as of Qt5.3.1 on Windows,
-#        so we just always compile them.
-#ReleaseBuild {
-    INCLUDEPATH += \
-        src/qgcunittest
-
-    HEADERS += \
-        src/qgcunittest/AutoTest.h \
-        src/qgcunittest/UASUnitTest.h \
-        src/qgcunittest/MockUASManager.h \
-        src/qgcunittest/MockUAS.h \
-        src/qgcunittest/MockQGCUASParamManager.h \
-        src/qgcunittest/MockMavlinkInterface.h \
-        src/qgcunittest/MockMavlinkFileServer.h \
-        src/qgcunittest/MultiSignalSpy.h \
-        src/qgcunittest/FlightModeConfigTest.h \
-        src/qgcunittest/FlightGearTest.h \
-        src/qgcunittest/TCPLinkTest.h \
-        src/qgcunittest/TCPLoopBackServer.h \
-        src/qgcunittest/QGCUASFileManagerTest.h
-
-    SOURCES += \
-        src/qgcunittest/UASUnitTest.cc \
-        src/qgcunittest/MockUASManager.cc \
-        src/qgcunittest/MockUAS.cc \
-        src/qgcunittest/MockQGCUASParamManager.cc \
-        src/qgcunittest/MockMavlinkFileServer.cc \
-        src/qgcunittest/MultiSignalSpy.cc \
-        src/qgcunittest/FlightModeConfigTest.cc \
-        src/qgcunittest/FlightGearTest.cc \
-        src/qgcunittest/TCPLinkTest.cc \
-        src/qgcunittest/TCPLoopBackServer.cc \
-        src/qgcunittest/QGCUASFileManagerTest.cc
-#}
+# We'd ideally only build this code as part of a Debug build, but qmake doesn't allow
+# for Debug-only files when generating Visual Studio projects [QTBUG-40351]
+INCLUDEPATH += \
+	src/qgcunittest
+
+HEADERS += \
+	src/qgcunittest/AutoTest.h \
+	src/qgcunittest/UASUnitTest.h \
+	src/qgcunittest/MockUASManager.h \
+	src/qgcunittest/MockUAS.h \
+	src/qgcunittest/MockQGCUASParamManager.h \
+	src/qgcunittest/MockMavlinkInterface.h \
+	src/qgcunittest/MockMavlinkFileServer.h \
+	src/qgcunittest/MultiSignalSpy.h \
+	src/qgcunittest/FlightModeConfigTest.h \
+	src/qgcunittest/FlightGearTest.h \
+	src/qgcunittest/TCPLinkTest.h \
+	src/qgcunittest/TCPLoopBackServer.h \
+	src/qgcunittest/QGCUASFileManagerTest.h
+
+SOURCES += \
+	src/qgcunittest/UASUnitTest.cc \
+	src/qgcunittest/MockUASManager.cc \
+	src/qgcunittest/MockUAS.cc \
+	src/qgcunittest/MockQGCUASParamManager.cc \
+	src/qgcunittest/MockMavlinkFileServer.cc \
+	src/qgcunittest/MultiSignalSpy.cc \
+	src/qgcunittest/FlightModeConfigTest.cc \
+	src/qgcunittest/FlightGearTest.cc \
+	src/qgcunittest/TCPLinkTest.cc \
+	src/qgcunittest/TCPLoopBackServer.cc \
+	src/qgcunittest/QGCUASFileManagerTest.cc