diff options
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/moc/allmocs_baseline_in.json | 2 | ||||
| -rw-r--r-- | tests/auto/tools/moc/related-metaobjects-in-namespaces.h | 2 | ||||
| -rw-r--r-- | tests/auto/tools/moc/related-metaobjects-name-conflict.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/moc/allmocs_baseline_in.json b/tests/auto/tools/moc/allmocs_baseline_in.json index 363ade3d53c..d8e6c4df538 100644 --- a/tests/auto/tools/moc/allmocs_baseline_in.json +++ b/tests/auto/tools/moc/allmocs_baseline_in.json @@ -2501,7 +2501,7 @@ { "isClass": false, "isFlag": false, - "lineNumber": 14, + "lineNumber": 13, "name": "SomeEnum", "values": [ "SomeEnumValue" diff --git a/tests/auto/tools/moc/related-metaobjects-in-namespaces.h b/tests/auto/tools/moc/related-metaobjects-in-namespaces.h index efd82107673..2513094ed0c 100644 --- a/tests/auto/tools/moc/related-metaobjects-in-namespaces.h +++ b/tests/auto/tools/moc/related-metaobjects-in-namespaces.h @@ -9,9 +9,9 @@ namespace QTBUG_2151 { class A : public QObject { Q_OBJECT - Q_ENUMS(SomeEnum) public: enum SomeEnum { SomeEnumValue = 0 }; + Q_ENUM(SomeEnum) }; class B : public QObject diff --git a/tests/auto/tools/moc/related-metaobjects-name-conflict.h b/tests/auto/tools/moc/related-metaobjects-name-conflict.h index cccd97e4e74..d88826f696a 100644 --- a/tests/auto/tools/moc/related-metaobjects-name-conflict.h +++ b/tests/auto/tools/moc/related-metaobjects-name-conflict.h @@ -9,15 +9,15 @@ #define DECLARE_GADGET_AND_OBJECT_CLASSES \ class Gadget { \ Q_GADGET \ - Q_ENUMS(SomeEnum) \ public: \ enum SomeEnum { SomeEnumValue = 0 }; \ + Q_ENUM(SomeEnum) \ }; \ class Object : public QObject{ \ Q_OBJECT \ - Q_ENUMS(SomeEnum) \ public: \ enum SomeEnum { SomeEnumValue = 0 }; \ + Q_ENUM(SomeEnum) \ }; #define DECLARE_DEPENDING_CLASSES \ |
