diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index cae153acf..e78a66533 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -5084,7 +5084,8 @@
   <define name="Q_OBJECT" value=""/>
   <define name="Q_PRIVATE_SLOT(d, signature)" value=""/>
   <define name="Q_SLOTS" value=""/>
-  <define name="Q_PROPERTY(X)" value=""/>
+  <!-- Treat as variadic macro to avoid preprocessorErrorDirective -->
+  <define name="Q_PROPERTY(...)" value=""/>
   <define name="Q_Q(Class)" value="Class * const q = q_func()"/>
   <define name="Q_RETURN_ARG(type, data)" value="QReturnArgument&lt;type &gt;(#type, data)"/>
   <define name="Q_UNLIKELY(expr)" value="expr"/>
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 584d1015a..73650f09c 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -573,4 +573,10 @@ namespace {
     // simplifyQtSignalsSlots2
     namespace Foo { class Bar; }
     class Foo::Bar : public QObject { private slots: };
+
+    // Q_PROPERTY with templates inducing a ',' should not produce a preprocessorErrorDirective
+    class AssocProperty : public QObject {
+    public:
+        Q_PROPERTY(QHash<QString, int> hash READ hash WRITE setHash)
+    };
 }