From e7202d159ac28d962b81d7ebdd422f94035a1d6e Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 17 Oct 2013 17:50:00 +0000
Subject: [PATCH] If static analysis is enabled disable error checking when
 compiling the Qt code. This should hopefully work around a builder issue.

svn path=/trunk/; revision=52661
---
 Makefile.nmake | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile.nmake b/Makefile.nmake
index 28b5e68e6d..b2cffa1da0 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -776,11 +776,18 @@ gtk:: help config.h svnversion.h doxygen
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib
 	cd ../..
 
+# The Visual C++ static analyzer currently fails with error C2171
+# when compiling summary_dialog.cpp. If/when this ever gets fixed
+# we can remove the ENABLE_CODE_ANALYSIS check.
 qt:: help config.h svnversion.h doxygen
 !IFDEF QT5_BASE_DIR
 	cd ui/qt
 	$(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro
+!IFDEF ENABLE_CODE_ANALYSIS
+	-nmake
+!ELSE
 	nmake
+!ENDIF
 	cd ../..
 !ENDIF