From c27953b62f942bd24d3f1c6b18adadacdb9e3df9 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Sat, 3 Nov 2007 12:50:02 -0400 Subject: [PATCH] ENH: remove qt warnings from qt with MS compiler --- Source/QtDialog/CMakeSetup.cxx | 2 +- Source/QtDialog/CMakeSetupDialog.h | 2 +- Source/QtDialog/QCMake.h | 4 ++++ Source/QtDialog/QCMakeCacheView.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 5ae5c428f..16178cdaf 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -14,7 +14,7 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ - +#include "QCMake.h" // include to disable MS warnings #include #include "cmSystemTools.h" diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 7dec6077a..8d85ee986 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -15,9 +15,9 @@ =========================================================================*/ +#include "QCMake.h" #include #include "ui_CMakeSetupDialog.h" -#include "QCMake.h" class QCMakeThread; class CMakeCacheModel; diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 38d94e699..b9abf1868 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -17,6 +17,10 @@ #ifndef __QCMake_h #define __QCMake_h +#ifdef _MSC_VER +#pragma warning ( disable : 4127 ) +#pragma warning ( disable : 4512 ) +#endif #include #include diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index cac9b4b02..a7e28e7af 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -18,13 +18,13 @@ #ifndef QCMakeCacheView_h #define QCMakeCacheView_h +#include "QCMake.h" #include #include #include #include #include -#include "QCMake.h" class QCMakeCacheModel;