|
|
@@ -281,9 +281,11 @@ cmQtAutoGenerators::cmQtAutoGenerators()
|
|
|
|
|
|
// Moc macro filters
|
|
|
this->MocMacroFilters[0].first = "Q_OBJECT";
|
|
|
- this->MocMacroFilters[0].second.compile("[\n][ \t]*Q_OBJECT[^a-zA-Z0-9_]");
|
|
|
+ this->MocMacroFilters[0].second.compile(
|
|
|
+ "[\n][ \t]*{?[ \t]*Q_OBJECT[^a-zA-Z0-9_]");
|
|
|
this->MocMacroFilters[1].first = "Q_GADGET";
|
|
|
- this->MocMacroFilters[1].second.compile("[\n][ \t]*Q_GADGET[^a-zA-Z0-9_]");
|
|
|
+ this->MocMacroFilters[1].second.compile(
|
|
|
+ "[\n][ \t]*{?[ \t]*Q_GADGET[^a-zA-Z0-9_]");
|
|
|
|
|
|
// Precompile regular expressions
|
|
|
this->MocRegExpInclude.compile(
|