From 174ad91de2718102d35b9b16dc05855c3abe2e52 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 13 Feb 2014 10:00:27 -0800
Subject: [PATCH] Silence some warnings from Windows build

Not going to fix these two warnings in Windows builds so silence from
makefile
---
 qgroundcontrol.pro | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index e16dc23f70..4e0fec940c 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -117,16 +117,23 @@ WindowsBuild {
 }
 
 #
-# Warnings cleanup. Plan of attack is to turn on warnings as error once all warnings are fixed. Please
-# do no change the warning level from what they are currently set to below.
+# We treat all warnings as errors which must be fixed before proceeding. If you run into a problem you can't fix
+# you can always use local pragmas to work around the warning. This should be used sparingly and only in cases where
+# the problem absolultey can't be fixed.
 #
 
 MacBuild | LinuxBuild {
 	QMAKE_CXXFLAGS_WARN_ON += -Wall
 }
 
+MacBuild {
+	QMAKE_CXXFLAGS_WARN_ON += -Werror
+}
+
 WindowsBuild {
-	QMAKE_CXXFLAGS_WARN_ON += /W3
+	QMAKE_CXXFLAGS_WARN_ON += /W3 \
+        /wd4996 \   # silence warnings about deprecated strcpy and whatnot
+        /wd4290     # ignore exception specifications
 }
 
 #
-- 
GitLab