summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Poikelin <joni.poikelin@qt.io>2023-11-30 13:21:34 +0200
committerJoni Poikelin <joni.poikelin@qt.io>2023-12-01 13:22:00 +0200
commitcc40039b4f0446b6a76f00d6f5008093bbef5c69 (patch)
tree90b17345dddfdfcac215b30b6e93a4d7ab1a4fd7
parent0201d5e2324539ddb4f017411ea2019b47bb1941 (diff)
Add Q_OBJECT_NO_OVERRIDE_WARNING for MSVC
Change-Id: I5fc19c03eae3b7ea1aab83c5e3c978d57970bd25 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/kernel/qtmetamacros.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qtmetamacros.h b/src/corelib/kernel/qtmetamacros.h
index 1ce6a49bde..ae68abcfee 100644
--- a/src/corelib/kernel/qtmetamacros.h
+++ b/src/corelib/kernel/qtmetamacros.h
@@ -103,6 +103,8 @@ QT_BEGIN_NAMESPACE
# endif
#elif defined(Q_CC_GNU) && Q_CC_GNU >= 501
# define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_GCC("-Wsuggest-override")
+#elif defined(Q_CC_MSVC)
+# define Q_OBJECT_NO_OVERRIDE_WARNING QT_WARNING_DISABLE_MSVC(26433)
#else
# define Q_OBJECT_NO_OVERRIDE_WARNING
#endif