diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-21 12:38:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-21 12:38:11 (GMT) |
| commit | d7c694b2e7ba43f634e920800efe138987d3b248 (patch) | |
| tree | bd5f487c9e5dd84e509393e8bae5475e6f2a223e /Source | |
| parent | 1ac07c71d8b410a9c1fedb4854786890b05e7ae0 (diff) | |
| parent | 50b3837c6420865f46911f7359040dcb65fc112f (diff) | |
| download | CMake-d7c694b2e7ba43f634e920800efe138987d3b248.zip CMake-d7c694b2e7ba43f634e920800efe138987d3b248.tar.gz CMake-d7c694b2e7ba43f634e920800efe138987d3b248.tar.bz2 | |
Merge topic 'autogen_brace'
50b3837c Autogen: Q_OBJECT behind brace test
01d2b745 Autogen: Check for Q_OBJECT/Q_GADGET after brace
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !986
Diffstat (limited to 'Source')
| -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( |