diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-03 11:41:06 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-03 19:36:34 +0000 |
| commit | d3ed7dac8aa2f4ede0c409254b9dd44842086be0 (patch) | |
| tree | b9fceef739824890f70a8e935e5d5bff8e7864eb /tests/auto/tools/moc | |
| parent | ca85d3370fa59e124b5568e86dc406029829e10a (diff) | |
moc: Handle include in enum, take 2
The existing logic broke down when we reentered the enumerator parsing
loop, and encountered a INCLUDE_MOC_END token in the first handleInclude
call. Fix this by restarting the loop in that case.
Amends d8a2456fbf18f60e2d1950585d93aa530df077bf.
Fixes: QTBUG-88125
Pick-to: 5.15
Change-Id: I87acaa986a81de53730eddc40bc7d48c15328aba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/tools/moc')
| -rw-r--r-- | tests/auto/tools/moc/enum_inc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/tools/moc/enum_inc.h b/tests/auto/tools/moc/enum_inc.h index 32eec283e4..7d7b6ae9f3 100644 --- a/tests/auto/tools/moc/enum_inc.h +++ b/tests/auto/tools/moc/enum_inc.h @@ -1 +1,2 @@ -parcel +parcel = 42, +part = 12, |