diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /tests/auto/tools | |
parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/moc/allmocs_baseline_in.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/tools/moc/allmocs_baseline_in.json b/tests/auto/tools/moc/allmocs_baseline_in.json index bde5a1c52b..d6b5375c5b 100644 --- a/tests/auto/tools/moc/allmocs_baseline_in.json +++ b/tests/auto/tools/moc/allmocs_baseline_in.json @@ -313,7 +313,7 @@ "read": "flagsList", "scriptable": true, "stored": true, - "type": "QList<Foo::Bar::Flags>", + "type": "QVector<Foo::Bar::Flags>", "user": false, "write": "setFlagsList" } @@ -340,7 +340,7 @@ "access": "public", "arguments": [ { - "type": "QList<QList<int> >" + "type": "QVector<QVector<int> >" } ], "name": "foo", @@ -350,7 +350,7 @@ "access": "public", "arguments": [ { - "type": "QList<QList<int> >" + "type": "QVector<QVector<int> >" } ], "name": "foo2", @@ -360,7 +360,7 @@ "access": "public", "arguments": [ { - "type": "QList< ::AAA::BaseA*>" + "type": "QVector< ::AAA::BaseA*>" } ], "name": "bar", @@ -370,7 +370,7 @@ "access": "public", "arguments": [ { - "type": "QList< ::AAA::BaseA*>" + "type": "QVector< ::AAA::BaseA*>" } ], "name": "bar2", @@ -380,7 +380,7 @@ "access": "public", "arguments": [ { - "type": "QList<const ::AAA::BaseA*>" + "type": "QVector<const ::AAA::BaseA*>" } ], "name": "bar3", |