1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moc: don't stumple over inline namespace in more places

Browse Source 
Ignore the 'inline' in case of nested namespace with another
nested inline namespace.

Amends 5222df2be7d10bf44dfc2971774eadcb526b7a13

Fixes: QTBUG-117765
Pick-to: 6.5
Change-Id: I87f2649606f63c818f225f8cc5ec914920763c5f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d39353085e4079ca1eadd787039f7746335225e8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Fabian Kosmale 2023-11-23 14:47:45 +01:00 committed by Qt Cherry-pick Bot
parent 580969bcbe
commit a8c1c38f94
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/moc/moc.cpp
View File

@ -672,8 +672,10 @@ void Moc::parse()
switch (next()) { switch (next()) {
case NAMESPACE: case NAMESPACE:
if (test(IDENTIFIER)) { if (test(IDENTIFIER)) {
while (test(SCOPE)) while (test(SCOPE)) {
test(INLINE); // ignore inline namespaces
next(IDENTIFIER); next(IDENTIFIER);
}
if (test(EQ)) { if (test(EQ)) {
// namespace Foo = Bar::Baz; // namespace Foo = Bar::Baz;
until(SEMIC); until(SEMIC);

3
tests/auto/tools/moc/tst_moc.cpp
View File

@ -77,6 +77,9 @@ const char *string_hash_hash = STRING_HASH_HASH("baz");
of writing this comment. of writing this comment.
*/ */
namespace A::inline B {} namespace A::inline B {}
namespace A {
namespace B::inline C {}
}
#endif #endif
Q_DECLARE_METATYPE(const QMetaObject*); Q_DECLARE_METATYPE(const QMetaObject*);