From 33a3c4e214ed1c4dacf41f78220c2dd1f6333a19 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 6 Jul 2017 15:37:57 +0300 Subject: [PATCH] Suppressing syntaxError doesn't work. --HG-- branch : develop --- src/libs/vgeometry/vpointf.h | 1 - src/libs/vmisc/diagnostic.h | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h index 5bb44a22f..b84d8c48e 100644 --- a/src/libs/vgeometry/vpointf.h +++ b/src/libs/vgeometry/vpointf.h @@ -92,7 +92,6 @@ private: Q_DECLARE_METATYPE(VPointF) Q_DECLARE_TYPEINFO(VPointF, Q_MOVABLE_TYPE); -// cppcheck-suppress syntaxError QT_WARNING_POP #endif // VPOINTF_H diff --git a/src/libs/vmisc/diagnostic.h b/src/libs/vmisc/diagnostic.h index a75f0e4ee..7acf70cc7 100644 --- a/src/libs/vmisc/diagnostic.h +++ b/src/libs/vmisc/diagnostic.h @@ -29,11 +29,7 @@ #ifndef DIAGNOSTIC_H #define DIAGNOSTIC_H -#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) - -#include - -#else +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) /* * Warning/diagnostic handling @@ -89,6 +85,6 @@ # define QT_WARNING_DISABLE_GCC(text) #endif -#endif // QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // DIAGNOSTIC_H