diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-26 13:33:42 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-27 09:21:08 +0200 |
| commit | d8a2456fbf18f60e2d1950585d93aa530df077bf (patch) | |
| tree | 4b16d1790e7a99039e0217f9f6bad2b8dfd4f2ce /tests/auto/tools/moc/allmocs_baseline_in.json | |
| parent | 370324f6e2f3ce7d250a1c3686918c08da1f8b06 (diff) | |
moc: handle include directives in enums
When including files, moc inserts a MOC_INCLUDE_BEGIN and
MOC_INCLUDE_END token into the token stream. Those are already handled
in the toplevel Moc::parse function, but parseEnum lacked support so
far.
Pick-to: 5.15
Fixes: QTBUG-80578
Change-Id: I35c8fd959347d94af20090b3a505dd9e6bfaff88
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/tools/moc/allmocs_baseline_in.json')
| -rw-r--r-- | tests/auto/tools/moc/allmocs_baseline_in.json | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/tools/moc/allmocs_baseline_in.json b/tests/auto/tools/moc/allmocs_baseline_in.json index 77647329c9..94593b1ef8 100644 --- a/tests/auto/tools/moc/allmocs_baseline_in.json +++ b/tests/auto/tools/moc/allmocs_baseline_in.json @@ -713,6 +713,23 @@ { "classes": [ { + "className": "Foo", + "object": true, + "qualifiedClassName": "Foo", + "superClasses": [ + { + "access": "public", + "name": "QObject" + } + ] + } + ], + "inputFile": "enum_with_include.h", + "outputRevision": 67 + }, + { + "classes": [ + { "classInfos": [ { "name": "Test", |