diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-06-19 06:00:46 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-06-20 08:49:00 (GMT) |
| commit | 01d2b745aa8f2fd27addbd4f94d3f7d5acb35a15 (patch) | |
| tree | 029651a0451b4e2beda2870a98f8c74640ecdda2 /Source/cmQtAutoGenerators.cxx | |
| parent | 829ce06c352e84f9b0b5fdd6acd10429181a91ef (diff) | |
| download | CMake-01d2b745aa8f2fd27addbd4f94d3f7d5acb35a15.zip CMake-01d2b745aa8f2fd27addbd4f94d3f7d5acb35a15.tar.gz CMake-01d2b745aa8f2fd27addbd4f94d3f7d5acb35a15.tar.bz2 | |
Autogen: Check for Q_OBJECT/Q_GADGET after brace
Closes #16971
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 27e4928..7f0bd86 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -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( |