Merge pull request #765 from Susurrus/qt5_win_fixes

Documenting why unit tests are in release build.

Merge pull request #765 from Susurrus/qt5_win_fixes
Documenting why unit tests are in release build.
c84cb8b5 · Lorenz Meier · 21bb1474 · f35180cd · c84cb8b5
Commit c84cb8b5 authored Jul 22, 2014 by Lorenz Meier
Show whitespace changes
Inline Side-by-side

Showing with 32 additions and 35 deletions

qgroundcontrol.pro qgroundcontrol.pro +32 -35

No files found.
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -750,14 +750,12 @@ SOURCES += \
 #
 # Unit Test specific configuration goes here
-#
+# We'd ideally only build this code as part of a Debug build, but qmake doesn't allow
-# FIXME: These files should only be enabled on the Debug build, but that is currently broken as of Qt5.3.1 on Windows,
+# for Debug-only files when generating Visual Studio projects [QTBUG-40351]
-#        so we just always compile them.
+INCLUDEPATH += \
-#ReleaseBuild {
-    INCLUDEPATH += \
 	src/qgcunittest
-    HEADERS += \
+HEADERS += \
 	src/qgcunittest/AutoTest.h \
 	src/qgcunittest/UASUnitTest.h \
 	src/qgcunittest/MockUASManager.h \
@@ -772,7 +770,7 @@ SOURCES += \
 	src/qgcunittest/TCPLoopBackServer.h \
 	src/qgcunittest/QGCUASFileManagerTest.h
-    SOURCES += \
+SOURCES += \
 	src/qgcunittest/UASUnitTest.cc \
 	src/qgcunittest/MockUASManager.cc \
 	src/qgcunittest/MockUAS.cc \
@@ -784,4 +782,3 @@ SOURCES += \
 	src/qgcunittest/TCPLinkTest.cc \
 	src/qgcunittest/TCPLoopBackServer.cc \
 	src/qgcunittest/QGCUASFileManagerTest.cc
-#}