diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h
index a1638e256..58218e637 100644
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@@ -55,6 +55,7 @@ Q_DECLARE_LOGGING_CATEGORY(vXML)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 /**
  * @brief The VDomDocument class represents a Valentina document (.val file).
diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp
index 4b0d861dc..98f32085e 100644
--- a/src/libs/qmuparser/qmuparserbase.cpp
+++ b/src/libs/qmuparser/qmuparserbase.cpp
@@ -1407,9 +1407,7 @@ void QmuParserBase::CreateRPN() const
                 }
                 ++stArgCount.top();
                 // fallthrough intentional (no break!)
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+                QMUP_FALLTHROUGH
             case cmEND:
                 ApplyRemainingOprt(stOpt, stVal);
                 break;
@@ -1466,9 +1464,7 @@ void QmuParserBase::CreateRPN() const
             case cmIF:
                 m_nIfElseCounter++;
                 // fallthrough intentional (no break!)
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+                QMUP_FALLTHROUGH
             case cmLE:
             case cmGE:
             case cmNEQ:
diff --git a/src/libs/qmuparser/qmuparserdef.h b/src/libs/qmuparser/qmuparserdef.h
index 9008ccf0a..5ca3bef72 100644
--- a/src/libs/qmuparser/qmuparserdef.h
+++ b/src/libs/qmuparser/qmuparserdef.h
@@ -52,6 +52,24 @@
 #    define QMUP_NOEXCEPT_EXPR(x)
 #  endif
 
+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#   define QMUP_FALLTHROUGH [[fallthrough]];
+#elif defined(Q_CC_CLANG) && __cplusplus >= 201103L
+    /* clang's fallthrough annotations are only available starting in C++11. */
+#   define QMUP_FALLTHROUGH [[clang::fallthrough]];
+#elif defined(Q_CC_MSVC)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+#   include <sal.h>
+#   define QMUP_FALLTHROUGH __fallthrough;
+#elif defined(Q_CC_GNU) && (__GNUC__ >= 7)
+#   define QMUP_FALLTHROUGH [[gnu::fallthrough]];
+#else
+#   define QMUP_FALLTHROUGH
+#endif
+
 /** @brief If this macro is defined mathematical exceptions (div by zero) will be thrown as exceptions. */
 //#define QMUP_MATH_EXCEPTIONS
 
diff --git a/src/libs/vdxf/dxflib/dl_codes.h b/src/libs/vdxf/dxflib/dl_codes.h
index 0bbcabcaf..48b98db73 100644
--- a/src/libs/vdxf/dxflib/dl_codes.h
+++ b/src/libs/vdxf/dxflib/dl_codes.h
@@ -530,5 +530,23 @@ const double dxfColors[][3] =
 #define DL_DCS_TRANS_CODE      2
 #define DL_PCS_TRANS_CODE      3
 
+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#   define DL_FALLTHROUGH [[fallthrough]];
+#elif defined(Q_CC_CLANG) && __cplusplus >= 201103L
+    /* clang's fallthrough annotations are only available starting in C++11. */
+#   define DL_FALLTHROUGH [[clang::fallthrough]];
+#elif defined(Q_CC_MSVC)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+#   include <sal.h>
+#   define DL_FALLTHROUGH __fallthrough;
+#elif defined(Q_CC_GNU) && (__GNUC__ >= 7)
+#   define DL_FALLTHROUGH [[gnu::fallthrough]];
+#else
+#   define DL_FALLTHROUGH
+#endif
+
 #endif
 
diff --git a/src/libs/vdxf/dxflib/dl_dxf.cpp b/src/libs/vdxf/dxflib/dl_dxf.cpp
index 2e0e3153d..de4e88a02 100644
--- a/src/libs/vdxf/dxflib/dl_dxf.cpp
+++ b/src/libs/vdxf/dxflib/dl_dxf.cpp
@@ -5866,14 +5866,10 @@ int DL_Dxf::getLibVersion(const std::string& str)
         {
             case 4:
                 v3 = ver.at(3).toInt();
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+            DL_FALLTHROUGH
             case 3:
                 v2 = ver.at(2).toInt();
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+            DL_FALLTHROUGH
             case 2:
                 v0 = ver.at(0).toInt();
                 v1 = ver.at(1).toInt();
diff --git a/src/libs/vgeometry/vabstractarc_p.h b/src/libs/vgeometry/vabstractarc_p.h
index b9fd832d7..45d80acca 100644
--- a/src/libs/vgeometry/vabstractarc_p.h
+++ b/src/libs/vgeometry/vabstractarc_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VAbstractArcData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vabstractcurve_p.h b/src/libs/vgeometry/vabstractcurve_p.h
index 8af49c6de..6a8448a57 100644
--- a/src/libs/vgeometry/vabstractcurve_p.h
+++ b/src/libs/vgeometry/vabstractcurve_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VAbstractCurveData : public QSharedData
 {
diff --git a/src/libs/vgeometry/varc_p.h b/src/libs/vgeometry/varc_p.h
index 52478ad1c..ee06c776a 100644
--- a/src/libs/vgeometry/varc_p.h
+++ b/src/libs/vgeometry/varc_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VArcData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vcubicbezier_p.h b/src/libs/vgeometry/vcubicbezier_p.h
index 9ca88a34c..48f799064 100644
--- a/src/libs/vgeometry/vcubicbezier_p.h
+++ b/src/libs/vgeometry/vcubicbezier_p.h
@@ -39,6 +39,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VCubicBezierData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vcubicbezierpath_p.h b/src/libs/vgeometry/vcubicbezierpath_p.h
index 2a3f46952..ccfc6a432 100644
--- a/src/libs/vgeometry/vcubicbezierpath_p.h
+++ b/src/libs/vgeometry/vcubicbezierpath_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VCubicBezierPathData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vellipticalarc_p.h b/src/libs/vgeometry/vellipticalarc_p.h
index e829153c3..bc7a1b866 100644
--- a/src/libs/vgeometry/vellipticalarc_p.h
+++ b/src/libs/vgeometry/vellipticalarc_p.h
@@ -8,6 +8,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VEllipticalArcData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vgobject_p.h b/src/libs/vgeometry/vgobject_p.h
index 6a059b4bb..36920deb9 100644
--- a/src/libs/vgeometry/vgobject_p.h
+++ b/src/libs/vgeometry/vgobject_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VGObjectData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vpointf_p.h b/src/libs/vgeometry/vpointf_p.h
index 6061c8c3e..5885768a3 100644
--- a/src/libs/vgeometry/vpointf_p.h
+++ b/src/libs/vgeometry/vpointf_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VPointFData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vspline_p.h b/src/libs/vgeometry/vspline_p.h
index b591709a3..93b6a2af4 100644
--- a/src/libs/vgeometry/vspline_p.h
+++ b/src/libs/vgeometry/vspline_p.h
@@ -38,6 +38,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VSplineData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vsplinepath_p.h b/src/libs/vgeometry/vsplinepath_p.h
index 4e18d9bbb..2a6b7be78 100644
--- a/src/libs/vgeometry/vsplinepath_p.h
+++ b/src/libs/vgeometry/vsplinepath_p.h
@@ -34,6 +34,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VSplinePathData : public QSharedData
 {
diff --git a/src/libs/vgeometry/vsplinepoint_p.h b/src/libs/vgeometry/vsplinepoint_p.h
index 2720e39d9..f01363c4e 100644
--- a/src/libs/vgeometry/vsplinepoint_p.h
+++ b/src/libs/vgeometry/vsplinepoint_p.h
@@ -39,6 +39,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VFSplinePointData : public QSharedData
 {
diff --git a/src/libs/vlayout/vabstractpiece.h b/src/libs/vlayout/vabstractpiece.h
index 9252633e6..1fcfd666d 100644
--- a/src/libs/vlayout/vabstractpiece.h
+++ b/src/libs/vlayout/vabstractpiece.h
@@ -44,6 +44,7 @@ class VAbstractPieceData;
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 /**
  * @brief The VSAPoint class seam allowance point
diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h
index 5b36f82c0..fa96dcdfb 100644
--- a/src/libs/vlayout/vabstractpiece_p.h
+++ b/src/libs/vlayout/vabstractpiece_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VAbstractPieceData : public QSharedData
 {
diff --git a/src/libs/vlayout/vcontour_p.h b/src/libs/vlayout/vcontour_p.h
index 84c09d145..6973a6a01 100644
--- a/src/libs/vlayout/vcontour_p.h
+++ b/src/libs/vlayout/vcontour_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VContourData : public QSharedData
 {
diff --git a/src/libs/vlayout/vlayoutpaper_p.h b/src/libs/vlayout/vlayoutpaper_p.h
index 81acb7a45..435eeb815 100644
--- a/src/libs/vlayout/vlayoutpaper_p.h
+++ b/src/libs/vlayout/vlayoutpaper_p.h
@@ -38,6 +38,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VLayoutPaperData : public QSharedData
 {
diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h
index f00a1dc67..de5d5a7b6 100644
--- a/src/libs/vlayout/vlayoutpiece_p.h
+++ b/src/libs/vlayout/vlayoutpiece_p.h
@@ -44,6 +44,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VLayoutPieceData : public QSharedData
 {
diff --git a/src/libs/vlayout/vlayoutpiecepath_p.h b/src/libs/vlayout/vlayoutpiecepath_p.h
index ccdc9f9b1..8d69994b5 100644
--- a/src/libs/vlayout/vlayoutpiecepath_p.h
+++ b/src/libs/vlayout/vlayoutpiecepath_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VLayoutPiecePathData : public QSharedData
 {
diff --git a/src/libs/vmisc/backport/qcommandlineoption.cpp b/src/libs/vmisc/backport/qcommandlineoption.cpp
index aa8000cf8..0ef2e0873 100644
--- a/src/libs/vmisc/backport/qcommandlineoption.cpp
+++ b/src/libs/vmisc/backport/qcommandlineoption.cpp
@@ -29,6 +29,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class QCommandLineOptionPrivate : public QSharedData
 {
diff --git a/src/libs/vmisc/backport/qcommandlineoption.h b/src/libs/vmisc/backport/qcommandlineoption.h
index 9d1edf8e5..035152f8a 100644
--- a/src/libs/vmisc/backport/qcommandlineoption.h
+++ b/src/libs/vmisc/backport/qcommandlineoption.h
@@ -30,6 +30,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class QCommandLineOptionPrivate;
 
diff --git a/src/libs/vmisc/backport/qcommandlineparser.cpp b/src/libs/vmisc/backport/qcommandlineparser.cpp
index 0294ceb0a..7982777b5 100644
--- a/src/libs/vmisc/backport/qcommandlineparser.cpp
+++ b/src/libs/vmisc/backport/qcommandlineparser.cpp
@@ -35,6 +35,7 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 QT_WARNING_DISABLE_GCC("-Wswitch-default")
 QT_WARNING_DISABLE_GCC("-Wsuggest-attribute=noreturn")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 typedef QHash<QString, int> NameHash_t;
 
diff --git a/src/libs/vmisc/backport/qcommandlineparser.h b/src/libs/vmisc/backport/qcommandlineparser.h
index 7e9721fdf..de9011b08 100644
--- a/src/libs/vmisc/backport/qcommandlineparser.h
+++ b/src/libs/vmisc/backport/qcommandlineparser.h
@@ -33,6 +33,7 @@ class QCoreApplication;
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class QCommandLineParser
 {
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index fce2848d7..46ccd9e4f 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -282,10 +282,22 @@ enum class GSizes : unsigned char { ALL,
 #define SCASSERT(cond) qt_noop();
 #endif /* V_NO_ASSERT */
 
-#ifdef Q_CC_CLANG
-#define V_FALLTHROUGH [[clang::fallthrough]];
+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#   define V_FALLTHROUGH [[fallthrough]];
+#elif defined(Q_CC_CLANG) && __cplusplus >= 201103L
+    /* clang's fallthrough annotations are only available starting in C++11. */
+#   define V_FALLTHROUGH [[clang::fallthrough]];
+#elif defined(Q_CC_MSVC)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+#   include <sal.h>
+#   define V_FALLTHROUGH __fallthrough;
+#elif defined(Q_CC_GNU) && (__GNUC__ >= 7)
+#   define V_FALLTHROUGH [[gnu::fallthrough]];
 #else
-#define V_FALLTHROUGH
+#   define V_FALLTHROUGH
 #endif
 
 extern const QString LONG_OPTION_NO_HDPI_SCALING;
diff --git a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h
index 089ed1180..1f21d3d3a 100644
--- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VAbstractFloatItemDataPrivate : public QSharedData
 {
diff --git a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h
index 7ddedddaf..c54e78e72 100644
--- a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h
@@ -38,6 +38,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VGrainlineDataPrivate : public QSharedData
 {
diff --git a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h
index ba6f7c74c..320b52d46 100644
--- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VPatternLabelDataPrivate : public QSharedData
 {
diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h
index 8ed73a4da..d2ea60154 100644
--- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VPieceLabelDataPrivate : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/varcradius_p.h b/src/libs/vpatterndb/variables/varcradius_p.h
index 58f904dab..138b2e25d 100644
--- a/src/libs/vpatterndb/variables/varcradius_p.h
+++ b/src/libs/vpatterndb/variables/varcradius_p.h
@@ -35,6 +35,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VArcRadiusData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vcurvevariable_p.h b/src/libs/vpatterndb/variables/vcurvevariable_p.h
index 185b57e57..61f9f9345 100644
--- a/src/libs/vpatterndb/variables/vcurvevariable_p.h
+++ b/src/libs/vpatterndb/variables/vcurvevariable_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VCurveVariableData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vincrement_p.h b/src/libs/vpatterndb/variables/vincrement_p.h
index 78af443fc..bb22c66b4 100644
--- a/src/libs/vpatterndb/variables/vincrement_p.h
+++ b/src/libs/vpatterndb/variables/vincrement_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VIncrementData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vinternalvariable_p.h b/src/libs/vpatterndb/variables/vinternalvariable_p.h
index 69ddf6566..64068d488 100644
--- a/src/libs/vpatterndb/variables/vinternalvariable_p.h
+++ b/src/libs/vpatterndb/variables/vinternalvariable_p.h
@@ -35,6 +35,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VInternalVariableData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vlineangle_p.h b/src/libs/vpatterndb/variables/vlineangle_p.h
index 969581f2f..fdf6fae93 100644
--- a/src/libs/vpatterndb/variables/vlineangle_p.h
+++ b/src/libs/vpatterndb/variables/vlineangle_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VLineAngleData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vlinelength_p.h b/src/libs/vpatterndb/variables/vlinelength_p.h
index 9f14a4f9f..47a6f9baa 100644
--- a/src/libs/vpatterndb/variables/vlinelength_p.h
+++ b/src/libs/vpatterndb/variables/vlinelength_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VLengthLineData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vmeasurement_p.h b/src/libs/vpatterndb/variables/vmeasurement_p.h
index 5b362090a..f8191116f 100644
--- a/src/libs/vpatterndb/variables/vmeasurement_p.h
+++ b/src/libs/vpatterndb/variables/vmeasurement_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VMeasurementData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/variables/vvariable_p.h b/src/libs/vpatterndb/variables/vvariable_p.h
index f3bff1f99..31168dea1 100644
--- a/src/libs/vpatterndb/variables/vvariable_p.h
+++ b/src/libs/vpatterndb/variables/vvariable_p.h
@@ -35,6 +35,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VVariableData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h
index 7d7cefda9..856dce1e9 100644
--- a/src/libs/vpatterndb/vcontainer.h
+++ b/src/libs/vpatterndb/vcontainer.h
@@ -62,6 +62,7 @@ class VEllipticalArc;
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 QT_WARNING_DISABLE_INTEL(2021)
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VContainerData : public QSharedData //-V690
 {
diff --git a/src/libs/vpatterndb/vnodedetail_p.h b/src/libs/vpatterndb/vnodedetail_p.h
index 6f2eb2b1f..dd023c6fc 100644
--- a/src/libs/vpatterndb/vnodedetail_p.h
+++ b/src/libs/vpatterndb/vnodedetail_p.h
@@ -35,6 +35,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VNodeDetailData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/vpiece_p.h b/src/libs/vpatterndb/vpiece_p.h
index be91f663f..0c4f8d918 100644
--- a/src/libs/vpatterndb/vpiece_p.h
+++ b/src/libs/vpatterndb/vpiece_p.h
@@ -42,6 +42,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VPieceData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/vpiecenode_p.h b/src/libs/vpatterndb/vpiecenode_p.h
index 8da853537..fe918a656 100644
--- a/src/libs/vpatterndb/vpiecenode_p.h
+++ b/src/libs/vpatterndb/vpiecenode_p.h
@@ -36,6 +36,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VPieceNodeData : public QSharedData
 {
diff --git a/src/libs/vpatterndb/vpiecepath_p.h b/src/libs/vpatterndb/vpiecepath_p.h
index 1ad364ce9..2cdc2c119 100644
--- a/src/libs/vpatterndb/vpiecepath_p.h
+++ b/src/libs/vpatterndb/vpiecepath_p.h
@@ -37,6 +37,7 @@
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 
 class VPiecePathData : public QSharedData
 {