diff options
-rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 2 | ||||
-rw-r--r-- | Source/QtDialog/CMakeSetupDialog.h | 2 | ||||
-rw-r--r-- | Source/QtDialog/QCMake.h | 4 | ||||
-rw-r--r-- | 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 5ae5c42..16178cd 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 <QApplication> #include "cmSystemTools.h" diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 7dec607..8d85ee9 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -15,9 +15,9 @@ =========================================================================*/ +#include "QCMake.h" #include <QMainWindow> #include "ui_CMakeSetupDialog.h" -#include "QCMake.h" class QCMakeThread; class CMakeCacheModel; diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 38d94e6..b9abf18 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 <QObject> #include <QString> diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index cac9b4b..a7e28e7 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 <QTableView> #include <QAbstractTableModel> #include <QCheckBox> #include <QLineEdit> #include <QItemDelegate> -#include "QCMake.h" class QCMakeCacheModel; |