diff --git a/common.pri b/common.pri index 95b1147a1..4fbf0b1ba 100644 --- a/common.pri +++ b/common.pri @@ -576,7 +576,7 @@ CLANG_DEBUG_CXXFLAGS += \ ICC_DEBUG_CXXFLAGS += \ $$ISYSTEM \ # Ignore warnings Qt headers. -Wcomment \ - #-Weffc++ \ # Disabled, produce to many "false positive" warning + -Weffc++ \ -Wextra-tokens \ -Wformat \ #-Winline \ @@ -597,7 +597,7 @@ ICC_DEBUG_CXXFLAGS += \ -Wunused-variable \ -pedantic \ -Wno-pch-messages \ - -wd1418,2012,2015 #disable warnings. Syntax example -wd1572,873,2259,2261 + -wd1418,2012,2015,2017,2022,2013 #disable warnings. Syntax example -wd1572,873,2259,2261 } else { # Don't use additional GCC and Clang keys on Windows system. # Can't find way mark ignore Qt header on Windows. diff --git a/src/libs/vdxf/dxflib/dl_entities.h b/src/libs/vdxf/dxflib/dl_entities.h index a024d46f0..09d56556a 100644 --- a/src/libs/vdxf/dxflib/dl_entities.h +++ b/src/libs/vdxf/dxflib/dl_entities.h @@ -1368,7 +1368,7 @@ struct DXFLIB_EXPORT DL_LeaderVertexData * Constructor. * Parameters: see member variables. */ - DL_LeaderVertexData(double px=0.0, double py=0.0, double pz=0.0) + explicit DL_LeaderVertexData(double px=0.0, double py=0.0, double pz=0.0) : x(px), y(py), z(pz) { } diff --git a/src/libs/vpatterndb/variables/vmeasurement_p.h b/src/libs/vpatterndb/variables/vmeasurement_p.h index 21fc9cea2..96ec10969 100644 --- a/src/libs/vpatterndb/variables/vmeasurement_p.h +++ b/src/libs/vpatterndb/variables/vmeasurement_p.h @@ -43,7 +43,8 @@ class VMeasurementData : public QSharedData public: VMeasurementData(quint32 index, const QString &gui_text, const QString &tagName) - :data(VContainer(nullptr, nullptr)), index(index), gui_text(gui_text), _tagName(tagName), formulaOk(true) + :data(VContainer(nullptr, nullptr)), index(index), formula(), gui_text(gui_text), _tagName(tagName), + formulaOk(true) {} VMeasurementData(VContainer *data, quint32 index, const QString &formula, bool ok, const QString &gui_text, diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h index 13d5fa631..ec13d2dfa 100644 --- a/src/libs/vpatterndb/vcontainer.h +++ b/src/libs/vpatterndb/vcontainer.h @@ -42,7 +42,10 @@ class VTranslateVars; -#ifdef Q_CC_GNU +#if defined(Q_CC_INTEL) + #pragma warning( push ) + #pragma warning( disable: 2021 ) +#elif defined(Q_CC_GNU) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Weffc++" #endif @@ -84,8 +87,10 @@ public: const Unit *patternUnit; }; -#ifdef Q_CC_GNU -#pragma GCC diagnostic pop +#if defined(Q_CC_INTEL) + #pragma warning( pop ) +#elif defined(Q_CC_GNU) + #pragma GCC diagnostic pop #endif /**