diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-11-23 14:47:45 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2023-11-24 08:48:01 +0100 |
commit | d39353085e4079ca1eadd787039f7746335225e8 (patch) | |
tree | e9240900ee4e18edfc04b3f5df35ba7221684c0a /src/tools/moc/moc.cpp | |
parent | 905593a40b6e161189ab3da663d037f0b47e04b0 (diff) |
Moc: don't stumple over inline namespace in more places
Ignore the 'inline' in case of nested namespace with another
nested inline namespace.
Amends 5222df2be7d10bf44dfc2971774eadcb526b7a13
Fixes: QTBUG-117765
Pick-to: 6.6 6.5
Change-Id: I87f2649606f63c818f225f8cc5ec914920763c5f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/tools/moc/moc.cpp')
-rw-r--r-- | src/tools/moc/moc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index cc5cc929b9..c1fa36c87a 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -706,8 +706,10 @@ void Moc::parse() switch (next()) { case NAMESPACE: if (test(IDENTIFIER)) { - while (test(SCOPE)) + while (test(SCOPE)) { + test(INLINE); // ignore inline namespaces next(IDENTIFIER); + } if (test(EQ)) { // namespace Foo = Bar::Baz; until(SEMIC); |