Add support for moc-ing TQ_OBJECT classes

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago · bf85388347
parent 9fdc22134b
commit bf85388347
1 changed files with 2 additions and 4 deletions
--- a/6
+++ b/6
@ -2116,10 +2116,8 @@ sub findMocCandidates ()
            seek(HFIN, 0, 0);
            read HFIN, $hfData, $hfsize;
            close HFIN;
-            # push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT
-	    # handle " { friend class blah; Q_OBJECT ", but don't match antlarr_Q_OBJECT (\b).
-            if ( $hfData =~ /{([^}]*)\bQ_OBJECT/s ) {
-                push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s;  ## reject "// Q_OBJECT"
+            if ( $hfData =~ /{([^}]*)\bT?Q_OBJECT/s ) {
+                push (@list, $hf) unless $1 =~ m://[^\n]*T?Q_OBJECT[^\n]*$:s;  ## reject "// (T)Q_OBJECT"
            }
        }
        # The assoc array of root of headerfile and header filename