Corrected the Windows Visual Studio compilation so that release builds no...

Corrected the Windows Visual Studio compilation so that release builds no longer have a console or debugging macros while the debug builds have both.
Fixed indentation across all build scripts (.pro/.pri) to be 4-spaces and consistent.
Updated the README with proper Visual Studio compilation instructions for both VS2010 and VS2008.

README

@@ -78,52 +78,25 @@ Done.
 Windows
 =======
 
-DETAILED STEPS BELOW THE VISUAL STUDIO 2010 NOTES.
 GNU GCC / MINGW IS UNTESTED, COULD WORK
 VISUAL STUDIO 2008 / 2010 EXPRESS EDITION IS FREE!
 
--------------------------------------------------------------------------------------
-VISUAL STUDIO 2010 NOTES (VS 2008 runs out-of-the-box, just follow the steps below):
-
-For use of Qt 4x with Visual Studio 2010 Add-in.
-
-Visual studio adds automatically certain defines that are wrong and cause errors.
-To resolve this, execute these steps:
-
-In the projects properties -> C/C++ ->preprocessor change:
-
-in DEBUG:
-	delete QT_NO_DEBUG
-
-in both (DEBUG / RELEASE):
-	delete QT_NO_DYNAMIC_CAST
--------------------------------------------------------------------------------------
-
-
-
-
-Steps for Visual Studio 2008 / 2010. (VS 2008 is easier, VS 2010 only recommended for
-expert developers)
-
+Steps for Visual Studio 2008 / 2010:
 
 Windows XP/7:
 
-1) Download and install the Qt SDK for Windows from http://qt.nokia.com/downloads/ (Visual Studio 2008 version) OR download Qt source and compile with VS 2010
-
-2) Download and install Visual Studio 2008 Express Edition (free) OR VS 2010 Express Edition
-
-3) Go to the QGroundControl folder and then to thirdParty -> libxbee
+1) Download and install the Qt libraries for Windows from https://qt.nokia.com/downloads/ (the Visual Studio 2008 or 2010 version as appropriate)
 
-4) Build the library. See win32.README 
+2) Download and install Visual Studio 2008 or 2010 Express Edition (free) from https://www.microsoft.com/visualstudio
 
-5) Go to the source folder of QGroundControl with the Qt 4.7.x Command Prompt tool (from the applications menu)
+3) Go to the QGroundControl folder and then to thirdParty/libxbee and build it following the instructions in win32.README
 
-6) Create the Visual Studio project by typing:
+4) Open the Qt Command Prompt program (should be in the Start Menu), navigate to the source folder of QGroundControl and create the Visual Studio project by typing:
 
-qmake -tp vc qgroundcontrol.pro
+`qmake -tp vc qgroundcontrol.pro`
 
-7) Now start Visual Studio and load the qgroundcontrol.vcproj file
+5) Now start Visual Studio and load the qgroundcontrol.vcproj if using Visual Studio 2008 or qgroundcontrol.vcxproj if using Visual Studio 2010
 
-8) Compile and edit in Visual Studio. If you need to add new files, add them to qgroundcontrol.pro and re-run "quake -tp vc qgroundcontrol.pro"
+6) Compile and edit in Visual Studio. If you need to add new files, add them to qgroundcontrol.pro and re-run `qmake -tp vc qgroundcontrol.pro`
 
 

READMEvc2010.txt

-
-For use of qt 4x and visual studio2010 and add in.
-
-The Visual studio adds automatically certain defines
-
-In the projects properties -> C/C++ ->preprocessor change:
-
-in DEBUG:
-	delete QT_NO_DEBUG
-
-Both:
-	delete QT_NO_DYNAMIC_CAST

qgcunittest.pro

@@ -4,10 +4,10 @@
 #
 #-------------------------------------------------
 
-QT       += network \
-            phonon \
-            testlib \
-            svg
+QT += network \
+    phonon \
+    testlib \
+    svg
 
 TEMPLATE = app
 
@@ -99,49 +99,46 @@ INCLUDEPATH += . \
     $$BASEDIR/src/ui/ \
 
 
-SOURCES +=  src/uas/UAS.cc \
-            src/comm/MAVLinkProtocol.cc \
-            src/uas/UASWaypointManager.cc \
-            src/Waypoint.cc \
-            src/ui/RadioCalibration/RadioCalibrationData.cc \
-            src/uas/SlugsMAV.cc \
-            src/uas/PxQuadMAV.cc \
-            src/uas/ArduPilotMegaMAV.cc \
-            src/GAudioOutput.cc \
-            src/uas/UASManager.cc \
-            src/comm/LinkManager.cc \
-            src/QGC.cc \
-            src/comm/SerialLink.cc \
-            $$TESTDIR/SlugsMavUnitTest.cc \
-            $$TESTDIR/testSuite.cc \
-            $$TESTDIR/UASUnitTest.cc \
+SOURCES += src/uas/UAS.cc \
+    src/comm/MAVLinkProtocol.cc \
+    src/uas/UASWaypointManager.cc \
+    src/Waypoint.cc \
+    src/ui/RadioCalibration/RadioCalibrationData.cc \
+    src/uas/SlugsMAV.cc \
+    src/uas/PxQuadMAV.cc \
+    src/uas/ArduPilotMegaMAV.cc \
+    src/GAudioOutput.cc \
+    src/uas/UASManager.cc \
+    src/comm/LinkManager.cc \
+    src/QGC.cc \
+    src/comm/SerialLink.cc \
+    $$TESTDIR/SlugsMavUnitTest.cc \
+    $$TESTDIR/testSuite.cc \
+    $$TESTDIR/UASUnitTest.cc \
     src/uas/QGCMAVLinkUASFactory.cc
 
 
 HEADERS += src/uas/UASInterface.h \
-            src/uas/UAS.h \
-            src/comm/MAVLinkProtocol.h \
-            src/comm/ProtocolInterface.h \
-            src/uas/UASWaypointManager.h \
-            src/Waypoint.h \
-            src/ui/RadioCalibration/RadioCalibrationData.h \
-            src/uas/SlugsMAV.h \
-            src/uas/PxQuadMAV.h \
-            src/uas/ArduPilotMegaMAV.h \
-            src/GAudioOutput.h \
-            src/uas/UASManager.h \
-            src/comm/LinkManager.h \
-            src/comm/LinkInterface.h \
-            src/QGC.h \
-            src/comm/SerialLinkInterface.h \
-            src/comm/SerialLink.h \
-            $$TESTDIR//SlugsMavUnitTest.h \
-            $$TESTDIR/AutoTest.h \
-            $$TESTDIR/UASUnitTest.h \
+    src/uas/UAS.h \
+    src/comm/MAVLinkProtocol.h \
+    src/comm/ProtocolInterface.h \
+    src/uas/UASWaypointManager.h \
+    src/Waypoint.h \
+    src/ui/RadioCalibration/RadioCalibrationData.h \
+    src/uas/SlugsMAV.h \
+    src/uas/PxQuadMAV.h \
+    src/uas/ArduPilotMegaMAV.h \
+    src/GAudioOutput.h \
+    src/uas/UASManager.h \
+    src/comm/LinkManager.h \
+    src/comm/LinkInterface.h \
+    src/QGC.h \
+    src/comm/SerialLinkInterface.h \
+    src/comm/SerialLink.h \
+    $$TESTDIR//SlugsMavUnitTest.h \
+    $$TESTDIR/AutoTest.h \
+    $$TESTDIR/UASUnitTest.h \
     src/uas/QGCMAVLinkUASFactory.h
 
 
-
-
-
 DEFINES += SRCDIR=\\\"$$PWD/\\\"

qgroundcontrol.pro

@@ -20,7 +20,7 @@
 
 # Qt configuration
 CONFIG += qt \
-	thread
+    thread
 QT += network \
     opengl \
     svg \
@@ -33,14 +33,14 @@ TEMPLATE = app
 TARGET = qgroundcontrol
 BASEDIR = $${IN_PWD}
 linux-g++|linux-g++-64{
-debug {
-    TARGETDIR = $${OUT_PWD}/debug
-    BUILDDIR = $${OUT_PWD}/build-debug
-}
-release {
-    TARGETDIR = $${OUT_PWD}/release
-    BUILDDIR = $${OUT_PWD}/build-release
-}
+    debug {
+        TARGETDIR = $${OUT_PWD}/debug
+        BUILDDIR = $${OUT_PWD}/build-debug
+    }
+    release {
+        TARGETDIR = $${OUT_PWD}/release
+        BUILDDIR = $${OUT_PWD}/build-release
+    }
 } else {
     TARGETDIR = $${OUT_PWD}
     BUILDDIR = $${OUT_PWD}/build
@@ -55,12 +55,12 @@ MAVLINKPATH = $$BASEDIR/thirdParty/mavlink/include
 DEFINES += MAVLINK_NO_DATA
 
 win32 {
-QMAKE_INCDIR_QT = $$(QTDIR)/include
-QMAKE_LIBDIR_QT = $$(QTDIR)/lib
-QMAKE_UIC = "$$(QTDIR)/bin/uic.exe"
-QMAKE_MOC = "$$(QTDIR)/bin/moc.exe"
-QMAKE_RCC = "$$(QTDIR)/bin/rcc.exe"
-QMAKE_QMAKE = "$$(QTDIR)/bin/qmake.exe"
+    QMAKE_INCDIR_QT = $$(QTDIR)/include
+    QMAKE_LIBDIR_QT = $$(QTDIR)/lib
+    QMAKE_UIC = "$$(QTDIR)/bin/uic.exe"
+    QMAKE_MOC = "$$(QTDIR)/bin/moc.exe"
+    QMAKE_RCC = "$$(QTDIR)/bin/rcc.exe"
+    QMAKE_QMAKE = "$$(QTDIR)/bin/qmake.exe"
 }
 
 
@@ -398,8 +398,8 @@ contains(DEPENDENCIES_PRESENT, protobuf):contains(MAVLINK_CONF, pixhawk) {
 
     # Enable only if protobuf is available
     HEADERS += thirdParty/mavlink/include/pixhawk/pixhawk.pb.h \
-               src/ui/map3D/ObstacleGroupNode.h \
-                src/ui/map3D/GLOverlayGeode.h
+        src/ui/map3D/ObstacleGroupNode.h \
+        src/ui/map3D/GLOverlayGeode.h
 }
 contains(DEPENDENCIES_PRESENT, libfreenect) { 
     message("Including headers for libfreenect")
@@ -535,7 +535,7 @@ contains(DEPENDENCIES_PRESENT, osg) {
         src/ui/map3D/Imagery.cc \
         src/ui/map3D/HUDScaleGeode.cc \
         src/ui/map3D/WaypointGroupNode.cc \
-		src/ui/map3D/TerrainParamDialog.cc
+        src/ui/map3D/TerrainParamDialog.cc
 
     contains(DEPENDENCIES_PRESENT, osgearth) { 
         message("Including sources for osgEarth")
@@ -549,8 +549,8 @@ contains(DEPENDENCIES_PRESENT, protobuf):contains(MAVLINK_CONF, pixhawk) {
 
     # Enable only if protobuf is available
     SOURCES += thirdParty/mavlink/src/pixhawk/pixhawk.pb.cc \
-               src/ui/map3D/ObstacleGroupNode.cc \
-               src/ui/map3D/GLOverlayGeode.cc
+        src/ui/map3D/ObstacleGroupNode.cc \
+        src/ui/map3D/GLOverlayGeode.cc
 }
 contains(DEPENDENCIES_PRESENT, libfreenect) { 
     message("Including sources for libfreenect")
@@ -588,19 +588,18 @@ TRANSLATIONS += es-MX.ts \
 
 # xbee support
 # libxbee only supported by linux and windows systems
-win32-msvc2008|win32-msvc2010|linux{
+win32-msvc2008|win32-msvc2010|linux {
     HEADERS += src/comm/XbeeLinkInterface.h \
-	src/comm/XbeeLink.h \
-	src/comm/HexSpinBox.h \
-	src/ui/XbeeConfigurationWindow.h \
-	src/comm/CallConv.h
+        src/comm/XbeeLink.h \
+        src/comm/HexSpinBox.h \
+        src/ui/XbeeConfigurationWindow.h \
+        src/comm/CallConv.h
     SOURCES += src/comm/XbeeLink.cpp \
-	src/comm/HexSpinBox.cpp \
-	src/ui/XbeeConfigurationWindow.cpp
+        src/comm/HexSpinBox.cpp \
+        src/ui/XbeeConfigurationWindow.cpp
     DEFINES += XBEELINK
     INCLUDEPATH += thirdParty/libxbee
-# TO DO: build library when it does not exists already
+# TO DO: build library when it does not exist already
     LIBS += -LthirdParty/libxbee/lib \
-	-llibxbee
-
-}
+        -llibxbee
+}
\ No newline at end of file