qproperty-without-notify: Don't warn for Q_GADGETS

CCMAIL: jpnurmi@qt.io

2 files changed, 16 insertions, 1 deletions

diff --git a/src/checks/level1/qproperty-without-notify.cpp b/src/checks/level1/qproperty-without-notify.cpp
index 42a7948d..4922073d 100644
--- a/src/checks/level1/qproperty-without-notify.cpp
+++ b/src/checks/level1/qproperty-without-notify.cpp
@@ -41,7 +41,20 @@ QPropertyWithoutNotify::QPropertyWithoutNotify(const std::string &name, ClazyCon
 void QPropertyWithoutNotify::VisitMacroExpands(const clang::Token &MacroNameTok, const clang::SourceRange &range)
 {
     IdentifierInfo *ii = MacroNameTok.getIdentifierInfo();
-    if (!ii || ii->getName() != "Q_PROPERTY")
+    if (!ii)
+        return;
+
+    if (ii->getName() == "Q_GADGET") {
+        m_lastIsGadget = true;
+        return;
+    }
+
+    if (ii->getName() == "Q_OBJECT") {
+        m_lastIsGadget = false;
+        return;
+    }
+
+    if (m_lastIsGadget || ii->getName() != "Q_PROPERTY")
         return;
 
     if (sm().isInSystemHeader(range.getBegin()))
diff --git a/src/checks/level1/qproperty-without-notify.h b/src/checks/level1/qproperty-without-notify.h
index 76d59deb..175924e6 100644
--- a/src/checks/level1/qproperty-without-notify.h
+++ b/src/checks/level1/qproperty-without-notify.h
@@ -35,6 +35,8 @@ public:
 private:
     void VisitMacroExpands(const clang::Token &MacroNameTok,
                            const clang::SourceRange &range) override;
+
+    bool m_lastIsGadget = false;
 };
 
 #endif